* lib/am/depend2.am: Search in srcdir and builddir for %SOURCE%

	before passing to cygpath.  Partial fix for PR automake/334.

diff --git a/ChangeLog b/ChangeLog
index da26db2..bec345f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-09  Tom Tromey  <tromey@redhat.com>
+
+       * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE%
+       before passing to cygpath.  Partial fix for PR automake/334.
+
 2002-07-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (generate_makefile): Suggest using AM_CPPFLAGS

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 35e153d..5db9394 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -59,19 +59,21 @@ endif !%FASTDEP%
 ?!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%