From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 5 Sep 2002 10:06:14 +0000 (+0000)
Subject: * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Account for
X-Git-Tag: Release-1-6d~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a555423901899def4e0bf581707534737986624;p=thirdparty%2Fautomake.git

* 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 27216a62c..3ec7a2757 100644
--- 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 071528372..7ca20b642 100644
--- 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 6b219d691..a2b62ab32 100644
--- 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)'`; \