# HG changeset patch # User Andrew Innes # Date 976110028 0 # Node ID 8f4d667d32c2714b97519340d9c1730b1025fed7 # Parent 82991c789888d1296301266751fccb00a636265c (NEW_CYGWIN): New define. (DQUOTE) [NEW_CYGWIN]: Cygnus changed the quoting rules since b20, so we need to adjust how we escape embedded quotes. diff -r 82991c789888 -r 8f4d667d32c2 nt/gmake.defs --- a/nt/gmake.defs Wed Dec 06 13:32:18 2000 +0000 +++ b/nt/gmake.defs Wed Dec 06 13:40:28 2000 +0000 @@ -76,6 +76,16 @@ SETLOADPATH=EMACSLOADPATH=../lisp endif +# Cygwin has changed quoting rules somewhat since b20, in a way that +# affects makefiles using sh as the command processor, so we need to +# detect which rules to use. +ifdef USING_SH +sh_output := $(shell echo foo") +ifeq "$(sh_output)" "" +NEW_CYGWIN = 1 +endif +endif + MAKEDIR = $(CURDIR) ALL_DEPS = $^ EMPTY = @@ -179,7 +189,9 @@ CP_DIR = cp -rf DEL = rm DEL_TREE = rm -r + ifdef USING_SH + IFNOTSAMEDIR = if [ ! -s ../same-dir.tst ] ; then FOREACH = for f in FORVAR = $${f} @@ -187,8 +199,14 @@ ENDFOR = ; done ENDIF = ; fi ARGQUOTE = ' +ifdef NEW_CYGWIN +DQUOTE = " +else DQUOTE = "" +endif + else + IFNOTSAMEDIR = if not exist ../same-dir.tst FOREACH = for %%f in ( FORVAR = %%f @@ -197,6 +215,7 @@ ENDIF = ARGQUOTE = " DQUOTE = \" + endif # The location of the icon file