automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: fix gnits3.test failure with Sun make.


From: Alexandre Duret-Lutz
Subject: FYI: fix gnits3.test failure with Sun make.
Date: Thu, 05 Sep 2002 12:04:29 +0200
User-agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.2 (i386-debian-linux-gnu)

I'm checking this in.

2002-09-05  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: lib/am/progs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/progs.am,v
retrieving revision 1.40
diff -u -r1.40 progs.am
--- lib/am/progs.am     24 Aug 2002 01:38:11 -0000      1.40
+++ lib/am/progs.am     5 Sep 2002 10:02:07 -0000
@@ -110,7 +110,9 @@
 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" | \
Index: lib/am/scripts.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/scripts.am,v
retrieving revision 1.48
diff -u -r1.48 scripts.am
--- lib/am/scripts.am   22 Jul 2002 17:00:44 -0000      1.48
+++ lib/am/scripts.am   5 Sep 2002 10:02:07 -0000
@@ -89,7 +89,9 @@
 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)'`; \

-- 
Alexandre Duret-Lutz





reply via email to

[Prev in Thread] Current Thread [Next in Thread]