Fix for PR automake/310:

* lib/am/depend2.am, lib/am/lex.am, lib/am/yacc.am: Quote %SOURCE%
so it never appears as a plain word.

diff --git a/ChangeLog b/ChangeLog
index a6e8fc342bafb93219ad33f8aa81a8b5b4a3c5e1..bc2c85d70b16ed1cb9c0c3cda197ef80f8794c9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       Fix for PR automake/310:
+       * lib/am/depend2.am, lib/am/lex.am, lib/am/yacc.am: Quote %SOURCE%
+       so it never appears as a plain word.
+
 2002-03-25  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * lib/depcomp (tru64): Correctly compute `base'.

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 46d3896dfc1e6636e3b44bd97ead74a2fb89186d..21b3a6d50e9a16ff61980ed21845a361210221ee 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -37,8 +37,8 @@ if %AMDEP%
        depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %COMPILE% %-c% %-o% %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
-?!-o?  %COMPILE% %-c% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+?-o?   %COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!-o?  %COMPILE% %-c% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 
 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
@@ -59,5 +59,5 @@ if  %AMDEP%
        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif  %AMDEP%
 ## We can always use `-o' with Libtool.
-       %LTCOMPILE% %-c% -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+       %LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 endif %?LIBTOOL%

diff --git a/lib/am/lex.am b/lib/am/lex.am
index 24d9d44aebd57769fee0e50eda8c948866d26093..a7b19207523ee60727b9433822061efa420cacd8 100644 (file)
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -19,7 +19,7 @@
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %?MORE-THAN-ONE%
-       $(SHELL) $(YLWRAP) `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
+       $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
 else !%?MORE-THAN-ONE%
        %COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 ## Edit out `#line' or `#' directives.

diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 02d7580800993211af19b2391bb12698a13fd88a..5bffe568f3ecd6791a3693291a708d29a99cad44 100644 (file)
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -19,9 +19,9 @@
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %?MORE-THAN-ONE%
-       $(SHELL) $(YLWRAP) `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+       $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
 else !%?MORE-THAN-ONE%
-       %COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+       %COMPILE% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 ## Edit out `#line' or `#' directives.
        sed '/^#/ s|y\.tab\.c|%OBJ%|' y.tab.c >%OBJ%
        rm -f y.tab.c