From 2a94387fc34c0b359959137086a8c96ef29aae1b Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Thu, 18 Aug 2005 16:39:29 +0000 Subject: minor Makefile fixes. --- lib/Makefile.netware | 8 +++++++- src/Makefile.netware | 5 ++++- 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 -- cgit v1.2.3