NetWare build tweaks.

Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


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

14 files changed, 36 insertions, 36 deletions

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index cade4acbf5..deb5232c34 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -18,10 +18,10 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/generators \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 0f41248444..9fc0ef2212 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 976fd50c0f..277dcbd490 100644
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 0215a499dc..614293181a 100644
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 84bb5036a8..1c34133a8b 100644
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a4412225cc..a3ecf4cb85 100644
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index ee7fbf89ec..27fee00a69 100644
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 0257d52a3f..5c4f8932b3 100644
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index c1b91f6b4f..fff1db7561 100644
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 19563da6df..35a7348a2c 100644
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 6a2c4cd0fb..5d41f78a1a 100644
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 1927d6263c..61b14c0960 100644
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 9068c69e14..2445fd3f20 100644
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 0ea3810640..6c36e7164b 100644
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -37,10 +37,10 @@ XINCDIRS	+= \
 			$(OSSLINC)/openssl \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/generators \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)