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 e8f5eed93ad3cf2f105d3ba20f2da8a4208bf4d8..523f85a0b91fa64014c777dc04232e4e1c2d418c 100644 (file)
--- 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 880e63719cf0ad432f3218008c72bbe85605fd50..67d15a760ac450a4554e25a3c4a4ff0095cd11e1 100644 (file)
--- 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 f5861c918c355d935c9be6cec1adcceaf07a92c0..ce5bb7b92de70469c58de1fcde54819acbd6a539 100644 (file)
--- 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 eb6889f0508cfe62a453dfe84b69bcb1be7b3da9..e9569500ce1d5dfa7f4e1c89ef0623ddf85d95b9 100644 (file)
--- 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 c617128832c3e099cd6434ddae2e32a8c3ae23cd..c43143289e5e433b092d9767ac229ee1ce5736fb 100644 (file)
--- 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 9c623096e7f9a6606b0e5d3cea3e993cbdd755ee..fa1e14c71787a7394d6d2c8bca510de0774a1226 100644 (file)
--- 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 d61fad1f9c18a1207610ce939d6d66e5fe2b749e..69bb334e715153349e4b7d1290df8c76f3db24ab 100644 (file)
--- 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 750465744d7321acc19d33ad3eb9cbd0eced73c0..59393b8a9d0c5b2bad2195f464d85bc1561892b4 100644 (file)
--- 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 ba2cf5aa590a33680818839f4a649e547c7f323e..3451b758863302bb4d1e6ede75cc87e06890501e 100644 (file)
--- 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)