From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 1 Dec 2009 15:00:11 +0000 (+0000)
Subject: more NetWare makefile cleanups.
X-Git-Tag: 2.3.5~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03a066c10a0df2a9479fb36c54228552eca3cddd;p=thirdparty%2Fapache%2Fhttpd.git

more NetWare makefile cleanups.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885781 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/NWGNUmakefile b/NWGNUmakefile
index e8f5eed93ad..523f85a0b91 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -71,8 +71,7 @@ XINCDIRS	+= \
 			$(AP_WORK)/modules/mappers/ \
 			$(AP_WORK)/modules/proxy/ \
 			$(AP_WORK)/modules/ssl/ \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
+			$(AP_WORK)/server/mpm/netware \
 			$(PCRE) \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 880e63719cf..67d15a760ac 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -334,7 +334,7 @@ PCRE		= $(PCRESRC)
 APRTEST		= $(APR_WORK)/test
 HTTPD		= $(AP_WORK)/modules/http
 XML		= $(APU_WORK)/xml
-PREBUILD_INST   = $(AP_WORK)\nwprebuild
+PREBUILD_INST   = $(AP_WORK)/nwprebuild
 
 #
 # Internal Libraries
diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index f5861c918c3..ce5bb7b92de 100644
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -26,9 +26,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index eb6889f0508..e9569500ce1 100644
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -26,9 +26,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUsocachdbm b/modules/cache/NWGNUsocachdbm
index c617128832c..c43143289e5 100644
--- a/modules/cache/NWGNUsocachdbm
+++ b/modules/cache/NWGNUsocachdbm
@@ -26,9 +26,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUsocachshmcb b/modules/cache/NWGNUsocachshmcb
index 9c623096e7f..fa1e14c7178 100644
--- a/modules/cache/NWGNUsocachshmcb
+++ b/modules/cache/NWGNUsocachshmcb
@@ -26,9 +26,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index d61fad1f9c1..69bb334e715 100644
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -27,9 +27,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(AP_WORK)/modules/dav/main \
 			$(AP_WORK)/modules/arch/netware \
 			$(NWOS) \
diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 750465744d7..59393b8a9d0 100644
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -27,9 +27,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(AP_WORK)/modules/dav/main \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index ba2cf5aa590..3451b758863 100644
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -26,9 +26,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
-			$(AP_WORK)/srclib/pcre \
+			$(AP_WORK)/server/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)