From 6a6fc6efcf78b620b1dae38f1dd7bc41d95d51b5 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 27 Jun 2009 21:50:16 +0000
Subject: fixed NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789019 13f79535-47bb-0310-9956-ffa450edef68
---
 xml/NWGNUmakefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'xml')

diff --git a/xml/NWGNUmakefile b/xml/NWGNUmakefile
index 5f85964f6..085bfa449 100644
--- a/xml/NWGNUmakefile
+++ b/xml/NWGNUmakefile
@@ -18,19 +18,19 @@ include $(APR_WORK)\build\NWGNUhead.inc
 #
 # Make sure all needed macro's are defined
 #
+V_PATH = \
+	$(EXPAT_SRC)/lib \
+	$(EOLIST)
 
 #
 # These directories will be at the beginning of the include list, followed by
 # INCDIRS
 #
 XINCDIRS	+= \
+			$(V_PATH) \
 			$(APR)/include \
+			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
-			$(APRUTIL)/include \
-			$(APRUTIL)/uri \
-			$(APRUTIL)/dbm/sdbm \
-			$(APRUTIL)/include/private \
-			$(APRUTIL)/xml/expat/lib \
 			$(EOLIST)
 
 #
@@ -43,6 +43,7 @@ XCFLAGS		+= \
 # These defines will come after DEFINES
 #
 XDEFINES	+= \
+			-DHAVE_EXPAT_CONFIG_H \
 			$(EOLIST)
 
 #
@@ -167,7 +168,7 @@ TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
-	$(OBJDIR)/xmllib.lib \
+	$(OBJDIR)/xml.lib \
 	$(EOLIST)
 
 #
@@ -247,7 +248,7 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-vpath %.c expat/lib
+vpath %.c $(V_PATH) 
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
-- 
cgit v1.2.1