summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-06-13 18:11:17 +0000
committerYang Tse <yangsita@gmail.com>2009-06-13 18:11:17 +0000
commit169e94d68b82d7da6a4fc06c6ec2880e3e53196b (patch)
tree8ad33248bd8f7e5e4f5f8443562891b5fc047130 /packages
parent0cc81840571accc48781c47b2c84e32fc5445846 (diff)
downloadcurl-169e94d68b82d7da6a4fc06c6ec2880e3e53196b.tar.gz
improve usability with UNIX-like shells or a DOS command interpreters
Diffstat (limited to 'packages')
-rw-r--r--packages/DOS/common.dj36
1 files changed, 34 insertions, 2 deletions
diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj
index 8ca30daea..33b7e7a89 100644
--- a/packages/DOS/common.dj
+++ b/packages/DOS/common.dj
@@ -14,6 +14,34 @@ MAKEFILE = Makefile.dj
OBJ_DIR = djgpp
#
+# Find out if using a UNIX-like shell or a DOS command interpreter
+#
+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
+
+#
+# Define shell dependant commands and vars
+#
+ifeq ($(IS_UNIX_SHELL),1)
+ COPY = cp -f
+ DELETE = rm -f
+ MKDIR = mkdir
+ RMDIR = rm -f -r
+ DS = /
+else
+ COPY = copy
+ DELETE = del
+ MKDIR = mkdir
+ RMDIR = rmdir
+ DS = \$(NOTHING)
+endif
+
+#
# OpenSSL is available from www.openssl.org and builds okay
# with djgpp/Watt-32. Set to 0 if you don't need https URLs
# (reduces curl.exe with approx 700 kB)
@@ -85,11 +113,15 @@ ifeq ($(USE_IDNA),1)
endif
ifeq ($(USE_DEBUG),1)
- CFLAGS += -DDEBUG=1 -DCURLDEBUG # -DDPRINTF_DEBUG2=1
+ CFLAGS += -DDEBUG=1 -DDEBUGBUILD
+endif
+
+ifeq ($(USE_CURLDEBUG),1)
+ CFLAGS += -DCURLDEBUG
endif
$(OBJ_DIR):
- mkdir $(OBJ_DIR)
+ $(MKDIR) $(OBJ_DIR)
$(OBJ_DIR)/%.o: %.c
$(CC) $(CFLAGS) -o $@ -c $<