Clean up environment variables

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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 027a8e37bffdcaf9afff0d7b5a06a559882b2b46..96a3a03f0dfd497415dbb2ed2a77105b6b17afd5 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -275,7 +275,7 @@ SUPMOD              = $(AP_WORK)/support
 PCRE           = $(AP_WORK)/srclib/pcre
 APRTEST                = $(APR_WORK)/test
 HTTPD          = $(AP_WORK)/modules/http
-XML                    = $(AP_WORK)/srclib/apr-util/xml
+XML            = $(APU_WORK)/xml
 
 #
 # Internal Libraries
@@ -284,7 +284,7 @@ XML                 = $(AP_WORK)/srclib/apr-util/xml
 APRLIB         = $(APR)/$(OBJDIR)/aprlib.lib
 APRUTLIB       = $(APRUTIL)/$(OBJDIR)/aprutil.lib
 STMODLIB       = $(STDMOD)/$(OBJDIR)/stdmod.lib
-PCRELIB                = $(PCRE/$(OBJDIR)/pcre.lib
+PCRELIB                = $(PCRE)/$(OBJDIR)/pcre.lib
 NWOSLIB                = $(NWOS)/$(OBJDIR)/netware.lib
 SERVLIB                = $(SERVER)/$(OBJDIR)/server.lib
 HTTPDLIB       = $(HTTPD)/$(OBJDIR)/httpd.lib