summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-06-12 08:40:55 +0000
committerYang Tse <yangsita@gmail.com>2009-06-12 08:40:55 +0000
commit90c9fd55fcef5d28721467e296c1d64d7437b64d (patch)
tree68d500323ef6817e18e62812721b70a0b9cd8269
parent47e403640baebb0df05639628c8aa5dfa77f76f4 (diff)
downloadcurl-90c9fd55fcef5d28721467e296c1d64d7437b64d.tar.gz
Fixed to take in account the different interpretation of double
quootes on UNIX-like shells vs DOS-like command interpreters.
-rw-r--r--src/makefile.dj12
1 files changed, 12 insertions, 0 deletions
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"