From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 8 Mar 2011 17:17:41 +0000 (+0000)
Subject: NetWare build overhaul in order to compile on Linux.
X-Git-Tag: 2.3.12~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77fda02c85a4f4d1a07813bdbf1fd1095adca884;p=thirdparty%2Fapache%2Fhttpd.git

NetWare build overhaul in order to compile on Linux.

Fixed some more paths and typos.


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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 8f1a80fb606..4fa1afdf45a 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -329,7 +329,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@netware.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	GetCurrentAddressSpace \
 	$(EOLIST)
@@ -344,7 +344,7 @@ endif
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	$(EOLIST)
 
 #
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index f63b5409b55..5e263659134 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -240,15 +240,16 @@ ifeq "$(RELEASE)" "debug"
 else
 	@echo $(DL)-sym internal$(DL)>> $@
 endif
-	@echo $(DL)-l $(NWOS)$(DL)>> $@
-	@echo $(DL)-l $(AP)/$(OBJDIR)$(DL)>> $@
-	@echo $(DL)-l $(APR)/$(OBJDIR)$(DL)>> $@
-	@echo $(DL)-l $(APRUTIL)/$(OBJDIR)$(DL)>> $@
-	@echo $(DL)-l $(PCRE)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(SRC)/$(OBJDIR)$(DL)>> $@
 	@echo $(DL)-l $(HTTPD)/$(OBJDIR)$(DL)>> $@
 	@echo $(DL)-l $(SERVER)/$(OBJDIR)$(DL)>> $@
 	@echo $(DL)-l $(STDMOD)/$(OBJDIR)$(DL)>> $@
 	@echo $(DL)-l $(NWOS)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(NWOS)$(DL)>> $@
+	@echo $(DL)-l $(APR)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(APR)$(DL)>> $@
+	@echo $(DL)-l $(APRUTIL)/$(OBJDIR)$(DL)>> $@
+	@echo $(DL)-l $(PCRE)/$(OBJDIR)$(DL)>> $@
 	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL)>> $@
 	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL)>> $@
 ifneq "$(IPV6)" ""