From 1207d90ca41fb48b12c7954a67c82c6667386a09 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 09:03:09 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ depend2.am | 2 +- lib/am/depend2.am | 2 +- tests/vartar.test | 14 +++++++------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4449742f..8045e581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-04-09 Akim Demaille + + * 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 * automake.in (&generate_makefile) Use macro_define to define diff --git a/depend2.am b/depend2.am index e61e28f3..285adf60 100644 --- 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 e61e28f3..285adf60 100644 --- 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 817ae729..578dbd04 100755 --- 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 -- 2.43.5