From: Yang Tse Date: Fri, 12 Jun 2009 08:40:55 +0000 (+0000) Subject: Fixed to take in account the different interpretation of double X-Git-Tag: curl-7_19_6~129 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90c9fd55fcef5d28721467e296c1d64d7437b64d;p=curl Fixed to take in account the different interpretation of double quootes on UNIX-like shells vs DOS-like command interpreters. --- diff --git a/src/makefile.dj b/src/makefile.dj index 9e1a20920..60f13f24d 100644 --- a/src/makefile.dj +++ b/src/makefile.dj @@ -39,6 +39,14 @@ CFLAGS += -DUSE_ENVIRONMENT PROGRAM = curl.exe OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o)) +ifneq ($(findstring COMMAND.COM,$(SHELL)),COMMAND.COM) + ifneq ($(findstring CMD.EXE,$(SHELL)),CMD.EXE) + ifneq ($(findstring 4DOS.COM,$(SHELL)),4DOS.COM) + IS_UNIX_SHELL = 1 + endif + endif +endif + all: $(OBJ_DIR) config.h $(PROGRAM) @echo Welcome to cURL @@ -46,7 +54,11 @@ $(PROGRAM): $(OBJECTS) ../lib/libcurl.a $(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS) config.h: +ifeq ($(IS_UNIX_SHELL),1) @echo '#include "../lib/config.dos"' > $@ +else + @echo #include "../lib/config.dos" > $@ +endif # # groff 1.18+ requires "-P -c"