automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch: FYI: Partial fix for 334


From: Tom Tromey
Subject: Patch: FYI: Partial fix for 334
Date: 09 Jul 2002 22:49:08 -0600

I'm checking this in.
This fixes the secondary problem noted by Alexandre in PR 334.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE%
        before passing to cygpath.  Partial fix for PR automake/334.

Index: lib/am/depend2.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/depend2.am,v
retrieving revision 1.43
diff -u -r1.43 depend2.am
--- lib/am/depend2.am 7 Jul 2002 22:38:45 -0000 1.43
+++ lib/am/depend2.am 10 Jul 2002 04:40:58 -0000
@@ -59,19 +59,21 @@
 ?!GENERIC?%OBJOBJ%: %SOURCE%
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
+       file="`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%"; \
        if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-         %-c% -o %OBJOBJ% `cygpath -w %SOURCE%`; \
+         %-c% -o %OBJOBJ% `cygpath -w "$$file"`; \
        then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
        else rm -f "%DEPBASE%.Tpo"; exit 1; \
        fi
 else !%FASTDEP%
+       file="`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%"; \
 if %AMDEP%
        source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
        depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `cygpath -w %SOURCE%`
-?!-o?  %COMPILE% %-c% `cygpath -w %SOURCE%`
+?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `cygpath -w "$$file"`
+?!-o?  %COMPILE% %-c% `cygpath -w "$$file"`
 endif !%FASTDEP%
 
 if %?LIBTOOL%



reply via email to

[Prev in Thread] Current Thread [Next in Thread]