From: Bradley Nicholes <bnicholes@apache.org>
Date: Thu, 2 Dec 2004 22:00:05 +0000 (+0000)
Subject: Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
X-Git-Tag: 2.1.2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4433699079f2956b927247b90873519d7511234c;p=thirdparty%2Fapache%2Fhttpd.git

Allow APR-UTIL to exist and build outside of the httpd/srclib file structure

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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index a84b9e246dd..027a8e37bff 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -270,7 +270,7 @@ NWOS		= $(AP_WORK)/os/netware
 SERVER		= $(AP_WORK)/server
 SRC		= $(AP_WORK)
 APR		= $(APR_WORK)
-APRUTIL		= $(APR_WORK)/../apr-util
+APRUTIL		= $(APU_WORK)
 SUPMOD		= $(AP_WORK)/support
 PCRE		= $(AP_WORK)/srclib/pcre
 APRTEST		= $(APR_WORK)/test
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 72dd90f6593..a9205c2ec4b 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -46,7 +46,7 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW
 	@echo -I..\modules\aaa >> $@
 	@echo -I..\os\netware >> $@
 	@echo -I..\server\mpm\netware >> $@
-	@echo -I$(APR_WORK)\include >> $@
+	@echo -I$(APR)\include >> $@
 	@echo -I$(APRUTIL)\include >> $@
 	@echo -ir $(NOVELLLIBC) >> $@
 
diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile
index e87a5effe7c..a40897c67c3 100644
--- a/srclib/pcre/NWGNUmakefile
+++ b/srclib/pcre/NWGNUmakefile
@@ -37,7 +37,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 #
 XINCDIRS	+= \
 			$(AP_WORK)/os/netware \
-			$(APR_WORK)/include/arch/netware \
+			$(APR)/include/arch/netware \
 			$(EOLIST)
 
 #
diff --git a/support/NWGNUab b/support/NWGNUab
index d7cd3211ee6..9f94eebde83 100644
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -19,9 +19,9 @@ XINCDIRS	+= \
 			$(NWOS) \
 			$(AP_WORK)/include \
 			$(APR)/include \
-			$(APRUTIL)/../apr-util/include \
+			$(APRUTIL)/include \
 			$(APR)/misc/netware \
-			$(APR_WORK) \
+			$(APR) \
 			$(EOLIST)
 
 #