On Cygwin, we can happily assume only POSIX-conforming shells exist. This commit is useless by itself, but is useful as a preparatory refactoring in view of a future change.
* lib/am/depend2.am: In recipes for producing '.obj' objects, use the POSIX form $(...) for command substitution, rather than the classic Bourne one `...`. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- lib/am/depend2.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 5522aa3..a947ee7 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -63,10 +63,10 @@ endif !%FASTDEP% if %FASTDEP% %VERBOSE%$(am__set_depbase) \ && %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \ -?GENERIC? `$(CYGPATH_W) '%SOURCE%'` \ +?GENERIC? $$($(CYGPATH_W) '%SOURCE%') \ ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. -?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \ -?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \ +?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \ +?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi) \ && $(am__mv) $$depbase.Tpo $$depbase.Po else !%FASTDEP% if %AMDEP% @@ -74,10 +74,10 @@ if %AMDEP% DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ endif %AMDEP% %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \ -?GENERIC? `$(CYGPATH_W) '%SOURCE%'` +?GENERIC? $$($(CYGPATH_W) '%SOURCE%') ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. -?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \ -?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` +?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \ +?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi) endif !%FASTDEP% endif %?NONLIBTOOL% -- 1.8.3.rc0.19.g7e6a0cc