diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2002-07-20 15:48:35 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2002-07-20 15:48:35 +0000 |
| commit | 0e1a92342585385b2fd8e4484fdbdd3fcc5ad021 (patch) | |
| tree | daad9c90d69dea6262812818c24c94e930e3cacb /lib/am/progs.am | |
| parent | 7481f43685dcb69d9269951fe2edb9140e86124b (diff) | |
| download | automake-0e1a92342585385b2fd8e4484fdbdd3fcc5ad021.tar.gz | |
* tests/gnits2.test: Use --program-prefix. Test for scripts too.
Replace the sed script by calls to grep, easier to debug.
* lib/am/progs.am (installcheck-%DIR%PROGRAMS): Honor nobase
and $(transform).
* lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise.
Diffstat (limited to 'lib/am/progs.am')
| -rw-r--r-- | lib/am/progs.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/am/progs.am b/lib/am/progs.am index 66eecdf7f..3c1c0e8cd 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -109,11 +109,16 @@ if %?CK-OPTS% .PHONY installcheck-am: installcheck-%DIR%PROGRAMS installcheck-%DIR%PROGRAMS: $(%DIR%_PROGRAMS) bad=0; pid=$$$$; list="$(%DIR%_PROGRAMS)"; for p in $$list; do \ +## Strip the directory and $(EXEEXT) before applying $(transform). + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +## Insert the directory back if nobase_ is used. +?!BASE? f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \ for opt in --help --version; do \ - if $(DESTDIR)$(%NDIR%dir)/$$p $$opt > c$${pid}_.out 2> c$${pid}_.err \ + if $(DESTDIR)$(%NDIR%dir)/$$f $$opt > c$${pid}_.out 2> c$${pid}_.err \ && test -n "`cat c$${pid}_.out`" \ && test -z "`cat c$${pid}_.err`"; then :; \ - else echo "$$p does not support $$opt" 1>&2; bad=1; fi; \ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad endif %?CK-OPTS% |