1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00

minor Makefile fixes.

This commit is contained in:
Gunter Knauf 2005-08-18 16:39:29 +00:00
parent 6a5c2b0fc3
commit 2a94387fc3
2 changed files with 11 additions and 2 deletions

View File

@ -23,7 +23,7 @@ OPENSSL_PATH = ../../openssl-0.9.8
endif endif
ifndef INSTDIR ifndef INSTDIR
INSTDIR = ../curl-$(LIBCURL_VERSION_STR)-bin-nw INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif endif
# Edit the vars below to change NLM target settings. # Edit the vars below to change NLM target settings.
@ -155,7 +155,10 @@ endif
ifeq ($(findstring linux,$(OSTYPE)),linux) ifeq ($(findstring linux,$(OSTYPE)),linux)
DL = ' DL = '
DS = /
#-include $(NDKBASE)/nlmconv/ncpfs.inc #-include $(NDKBASE)/nlmconv/ncpfs.inc
else
DS = \\
endif endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
@ -192,6 +195,9 @@ install: $(INSTDIR) all
@$(CP) ../COPYING $(INSTDIR) @$(CP) ../COPYING $(INSTDIR)
@$(CP) ../README $(INSTDIR) @$(CP) ../README $(INSTDIR)
@$(CP) ../RELEASE-NOTES $(INSTDIR) @$(CP) ../RELEASE-NOTES $(INSTDIR)
ifdef WITH_SSL
@$(CP) ca-bundle.crt $(INSTDIR)
endif
clean: clean:
-$(RM) config.h ca-bundle.h -$(RM) config.h ca-bundle.h

View File

@ -23,7 +23,7 @@ OPENSSL_PATH = ../../openssl-0.9.8
endif endif
ifndef INSTDIR ifndef INSTDIR
INSTDIR = ../curl-$(LIBCURL_VERSION_STR)-bin-nw INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
endif endif
# Edit the vars below to change NLM target settings. # Edit the vars below to change NLM target settings.
@ -144,7 +144,10 @@ endif
ifeq ($(findstring linux,$(OSTYPE)),linux) ifeq ($(findstring linux,$(OSTYPE)),linux)
DL = ' DL = '
DS = /
#-include $(NDKBASE)/nlmconv/ncpfs.inc #-include $(NDKBASE)/nlmconv/ncpfs.inc
else
DS = \\
endif endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines