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 a84b9e246dd2c733eda701f7d5b25eaf882b47d0..027a8e37bffdcaf9afff0d7b5a06a559882b2b46 100644 (file)
--- 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 72dd90f659326f5f754c68547fa8f4a0176d738b..a9205c2ec4b9435436da5676b67c7039515027fa 100644 (file)
--- 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 e87a5effe7c04e68d6613d354f3f9db8780ab752..a40897c67c34016ddd7548ea12064015ed4506f2 100644 (file)
--- 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 d7cd3211ee6d1dc2fb556a87bf6a7d7a96e088fa..9f94eebde83f17507b9b75fd9246ddf5106d2889 100644 (file)
--- 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)
 
 #