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 8f1a80fb606eeed8293a9fdd5e5e5c14eb2d9c63..4fa1afdf45adea99b1f86d68eefa528fdb394700 100644 (file)
--- 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 f63b5409b55fd74c0e259d594b117d59456ad5f5..5e263659134e0e24e1686383e97d8ab08fdffb8b 100644 (file)
--- 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)" ""