[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: fix for PR/310
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: fix for PR/310 |
Date: |
Tue, 26 Mar 2002 10:21:36 +0100 |
User-agent: |
Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.1 (i386-debian-linux-gnu) |
I'm checking this in.
It fixes the following failures with Solaris make:
ccnoco.test
pr224.test
subobj6.test
yacc8.test
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1792
diff -u -r1.1792 ChangeLog
--- ChangeLog 2002/03/21 17:10:47 1.1792
+++ ChangeLog 2002/03/26 09:18:29
@@ -1,3 +1,9 @@
+2002-03-26 Alexandre Duret-Lutz <address@hidden>
+
+ 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-21 Alexandre Duret-Lutz <address@hidden>
* tests/pr211.test: s/requires/required/, otherwise the test fails
Index: lib/am/depend2.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/depend2.am,v
retrieving revision 1.41
diff -u -r1.41 depend2.am
--- depend2.am 2002/01/20 21:30:21 1.41
+++ depend2.am 2002/03/26 09:18:29
@@ -37,8 +37,8 @@
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 @@
$(%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%
Index: lib/am/lex.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lex.am,v
retrieving revision 1.7
diff -u -r1.7 lex.am
--- lex.am 2002/02/25 11:00:33 1.7
+++ lex.am 2002/03/26 09:18:29
@@ -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.
Index: lib/am/yacc.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/yacc.am,v
retrieving revision 1.12
diff -u -r1.12 yacc.am
--- yacc.am 2002/02/25 11:00:33 1.12
+++ yacc.am 2002/03/26 09:18:29
@@ -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
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: fix for PR/310,
Alexandre Duret-Lutz <=