* lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Account for

Sun make rewriting rules in VPATH builds.  (Fixes gnits3.test.)
* lib/am/progs.am (installcheck-%DIR%PROGRAMS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 27216a62c276b7963cd7937fa96e2bfb28059bb3..3ec7a275787e97dde5374457e0b046c1fc300521 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Account for
+       Sun make rewriting rules in VPATH builds.  (Fixes gnits3.test.)
+       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Likewise.
+
 2002-09-04  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        For automake/354:

diff --git a/lib/am/progs.am b/lib/am/progs.am
index 071528372c27d89aac9384721779cd13024c288b..7ca20b642ccb77f0807191c525a08627a5b71901 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -110,7 +110,9 @@ if %?CK-OPTS%
 installcheck-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
        bad=0; pid=$$$$; list="$(%DIR%_PROGRAMS)"; for p in $$list; do \
          case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-          *" $$p "*) continue;; \
+## Match $(srcdir)/$$p in addition to $$p because Sun make might rewrite
+## filenames in AM_INSTALLCHECK_STD_OPTIONS_EXEMPT during VPATH builds.
+          *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
          esac; \
 ## Strip the directory and $(EXEEXT) before applying $(transform).
          f=`echo "$$p" | \

diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 6b219d691be7b15710d1dbb6d5bd4a824afd42d0..a2b62ab321a61402c17e774bbb192c4d62d4d23e 100644 (file)
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -89,7 +89,9 @@ if %?CK-OPTS%
 installcheck-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
        bad=0; pid=$$$$; list="$(%DIR%_SCRIPTS)"; for p in $$list; do \
          case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-          *" $$p "*) continue;; \
+## Match $(srcdir)/$$p in addition to $$p because Sun make might rewrite
+## filenames in AM_INSTALLCHECK_STD_OPTIONS_EXEMPT during VPATH builds.
+          *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
          esac; \
 ## Strip any leading directory before applying $(transform).
          f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \