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

diff --git a/ChangeLog b/ChangeLog
index 4449742..8045e58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
+       * 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.
+
+       
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
        * automake.in (&generate_makefile) Use macro_define to define
        SOURCES and OBJECTS.
        (&variable_defined): Don't check for $conditional{VAR}{COND} as

diff --git a/depend2.am b/depend2.am
index e61e28f..285adf6 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -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%

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index e61e28f..285adf6 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -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%

diff --git a/tests/vartar.test b/tests/vartar.test
index 817ae72..578dbd0 100755 (executable)
--- a/tests/vartar.test
+++ b/tests/vartar.test
@@ -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