(NEW_CYGWIN): New define.

(DQUOTE) [NEW_CYGWIN]: Cygnus changed the quoting rules since b20,
so we need to adjust how we escape embedded quotes.
This commit is contained in:
Andrew Innes 2000-12-06 13:40:28 +00:00
parent 3887b4498e
commit 8cba0ed749

View file

@ -76,6 +76,16 @@ SHELLTYPE=SH
SETLOADPATH=EMACSLOADPATH=../lisp SETLOADPATH=EMACSLOADPATH=../lisp
endif 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) MAKEDIR = $(CURDIR)
ALL_DEPS = $^ ALL_DEPS = $^
EMPTY = EMPTY =
@ -179,7 +189,9 @@ CP = cp -f
CP_DIR = cp -rf CP_DIR = cp -rf
DEL = rm DEL = rm
DEL_TREE = rm -r DEL_TREE = rm -r
ifdef USING_SH ifdef USING_SH
IFNOTSAMEDIR = if [ ! -s ../same-dir.tst ] ; then IFNOTSAMEDIR = if [ ! -s ../same-dir.tst ] ; then
FOREACH = for f in FOREACH = for f in
FORVAR = $${f} FORVAR = $${f}
@ -187,8 +199,14 @@ FORDO = ; do
ENDFOR = ; done ENDFOR = ; done
ENDIF = ; fi ENDIF = ; fi
ARGQUOTE = ' ARGQUOTE = '
DQUOTE = "" ifdef NEW_CYGWIN
DQUOTE = "
else else
DQUOTE = ""
endif
else
IFNOTSAMEDIR = if not exist ../same-dir.tst IFNOTSAMEDIR = if not exist ../same-dir.tst
FOREACH = for %%f in ( FOREACH = for %%f in (
FORVAR = %%f FORVAR = %%f
@ -197,6 +215,7 @@ ENDFOR =
ENDIF = ENDIF =
ARGQUOTE = " ARGQUOTE = "
DQUOTE = \" DQUOTE = \"
endif endif
# The location of the icon file # The location of the icon file