summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2005-08-18 16:39:29 +0000
committerGunter Knauf <gk@gknw.de>2005-08-18 16:39:29 +0000
commit2a94387fc34c0b359959137086a8c96ef29aae1b (patch)
tree511bf5d61ba8ef5568133752b1abc0874b3aa4a1
parent6a5c2b0fc3f65c078a1eafd5a66b07477fd533e8 (diff)
downloadgnurl-2a94387fc34c0b359959137086a8c96ef29aae1b.tar.gz
gnurl-2a94387fc34c0b359959137086a8c96ef29aae1b.tar.bz2
gnurl-2a94387fc34c0b359959137086a8c96ef29aae1b.zip
minor Makefile fixes.
-rw-r--r--lib/Makefile.netware8
-rw-r--r--src/Makefile.netware5
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 7bfd2e4da..d19dc5ea5 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -23,7 +23,7 @@ OPENSSL_PATH = ../../openssl-0.9.8
endif
ifndef INSTDIR
-INSTDIR = ../curl-$(LIBCURL_VERSION_STR)-bin-nw
+INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif
# Edit the vars below to change NLM target settings.
@@ -155,7 +155,10 @@ endif
ifeq ($(findstring linux,$(OSTYPE)),linux)
DL = '
+DS = /
#-include $(NDKBASE)/nlmconv/ncpfs.inc
+else
+DS = \\
endif
# Makefile.inc provides the CSOURCES and HHEADERS defines
@@ -192,6 +195,9 @@ install: $(INSTDIR) all
@$(CP) ../COPYING $(INSTDIR)
@$(CP) ../README $(INSTDIR)
@$(CP) ../RELEASE-NOTES $(INSTDIR)
+ifdef WITH_SSL
+ @$(CP) ca-bundle.crt $(INSTDIR)
+endif
clean:
-$(RM) config.h ca-bundle.h
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 315bb0dbb..e9e2de36e 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -23,7 +23,7 @@ OPENSSL_PATH = ../../openssl-0.9.8
endif
ifndef INSTDIR
-INSTDIR = ../curl-$(LIBCURL_VERSION_STR)-bin-nw
+INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif
# Edit the vars below to change NLM target settings.
@@ -144,7 +144,10 @@ endif
ifeq ($(findstring linux,$(OSTYPE)),linux)
DL = '
+DS = /
#-include $(NDKBASE)/nlmconv/ncpfs.inc
+else
+DS = \\
endif
# Makefile.inc provides the CSOURCES and HHEADERS defines