From 52205f5e7ffb4f687a9ecab3c74f3059a4cdd38e Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 26 Mar 2002 09:24:53 +0000
Subject: [PATCH] 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.

---
 ChangeLog         | 6 ++++++
 lib/am/depend2.am | 6 +++---
 lib/am/lex.am     | 2 +-
 lib/am/yacc.am    | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6e8fc3..bc2c85d 100644
--- 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 46d3896..21b3a6d 100644
--- 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 24d9d44..a7b1920 100644
--- 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 02d7580..5bffe56 100644
--- 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
-- 
2.7.4