From: Gunter Knauf <gk@gknw.de>
Date: Thu, 10 Jun 2004 17:11:39 +0000 (+0000)
Subject: make include path overridable.
X-Git-Tag: pre-aifix~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a3797a699cb8ae0a5416466a1b5d48443a9e287;p=curl

make include path overridable.
---

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 4b88d00db..2df0b5076 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -8,11 +8,13 @@
 #################################################################
 
 # Edit the path below to point to the base of your Novell NDK.
-BASE	= c:/novell
+ifndef NDKBASE
+NDKBASE	= /novell
+endif
 INSTDIR	= s:/libcurl
 
 # Edit the path below to point to the base of your Zlib sources.
-#ZLIB_PATH = ../../../cw/zlib-src-1.1.4
+#ZLIB_PATH = ../../zlib-1.2.1
 
 # Edit the vars below to change NLM target settings.
 TARGET  = libcurl
@@ -88,13 +90,13 @@ ifeq ($(LIBARCH),LIBC)
 #	CFLAGS += -D__ANSIC__
 else
 	PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
-	CFLAGS += -include $(BASE)/nlmconv/genlm.h
+	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
 endif
 endif
 
 LDLIBS	=
 
-NDK_ROOT = $(BASE)/ndk
+NDK_ROOT = $(NDKBASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
 SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
@@ -126,7 +128,7 @@ endif
 
 ifeq ($(OSTYPE),linux)
 DL	= '
-#-include $(BASE)/nlmconv/ncpfs.inc
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
 endif
 
 OBJS	= \
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 6336b3019..eb43c2c32 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -8,11 +8,13 @@
 #################################################################
 
 # Edit the path below to point to the base of your Novell NDK.
-BASE	= c:/novell
+ifndef NDKBASE
+NDKBASE	= /novell
+endif
 INSTDIR	= s:/libcurl
 
 # Edit the path below to point to the base of your Zlib sources.
-#ZLIB_PATH = ../../../cw/zlib-src-1.1.4
+#ZLIB_PATH = ../../zlib-1.2.1
 
 # Edit the vars below to change NLM target settings.
 TARGET  = curl
@@ -90,13 +92,13 @@ ifeq ($(LIBARCH),LIBC)
 #	CFLAGS += -D__ANSIC__
 else
 	PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
-	CFLAGS += -include $(BASE)/nlmconv/genlm.h
+	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
 endif
 endif
 
 LDLIBS	=
 
-NDK_ROOT = $(BASE)/ndk
+NDK_ROOT = $(NDKBASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
 SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
@@ -129,7 +131,7 @@ endif
 
 ifeq ($(OSTYPE),linux)
 DL	= '
-#-include $(BASE)/nlmconv/ncpfs.inc
+#-include $(NDKBASE)/nlmconv/ncpfs.inc
 endif
 
 OBJS	= \