Index: ChangeLog
from  Akim Demaille  <[EMAIL PROTECTED]>
        * depend2.am (@AMDEP@%FPFX%DEPMODE): Define it when GENERIC so
        that it does not get noticed twice by automake, which now
        complains for multiple definitions.
        * tests/vartar.test: s/INSTALL/install/g, automake now complains
        because we defined INSTALL.
        
        
Index: depend2.am
--- depend2.am Sun, 04 Mar 2001 20:02:14 +0100 akim (am/g/43_depend2.am 1.8 644)
+++ depend2.am Sat, 10 Mar 2001 19:26:45 +0100 akim (am/g/43_depend2.am 1.8 644)
@@ -21,7 +21,7 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.
 
-?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@
+?GENERIC??AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@
 
 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
Index: tests/vartar.test
--- tests/vartar.test Mon, 26 Feb 2001 23:44:40 +0100 akim (am/h/25_vartar.tes 1.2 755)
+++ tests/vartar.test Sat, 10 Mar 2001 19:21:07 +0100 akim (am/h/25_vartar.tes 1.2 755)
@@ -5,20 +5,20 @@
 . $srcdir/defs || exit 1
 
 cat > Makefile.am << 'END'
-INSTALL = INSTALL
-INSTALL:
-       $(INSTALL) INSTALL
+install = install
+install:
+       $(install) install
 END
 
 $AUTOMAKE || exit 1
 
-grep '^INSTALL = INSTALL$' Makefile.in || exit 1
+grep '^install = install$' Makefile.in || exit 1
 
 cat > target.expected <<'EOF'
-INSTALL:
-       $(INSTALL) INSTALL
+install:
+       $(install) install
 EOF
-sed -n '/^INSTALL:/,/^ /p' Makefile.in > target.value
+sed -n '/^install:/,/^ /p' Makefile.in > target.value
 diff target.expected target.value || exit 1
 
 exit 0

Reply via email to