some NetWare build improvements.

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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index e39ba37e583ec7c21e917342133c5335c721a80f..50408ca3f005960baaa5e678c307c4361a7e1fc0 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -125,7 +125,7 @@ LIB = mwldnlm -type library -w nocmdline
 AWK    = awk
 
 # Define minimum APR version to check for
-APR_WANTED = 1003000
+APR_WANTED = 1004000
 
 ifdef IPV6
 ifndef USE_STDSOCKETS

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 8cd578498b65364f2065ca418ea81c4bbe30000c..053cd3c2eb8a429fa977121a6532f4a8f628a106 100644 (file)
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -25,7 +25,7 @@ nlms :: chkapr $(NWOS)/httpd.imp
 
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
        @echo Generating $(subst /,\,$@)
-       $(AWK) -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp
+       $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | sort >$@
     
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
        @echo Generating $(subst /,\,$@)
@@ -73,4 +73,10 @@ clean ::
        $(CHK) cc.opt                                       $(DEL) cc.opt
        $(CHK) NWGNUversion.inc                             $(DEL) NWGNUversion.inc
 
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
     

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 3169f9c8262738f1d3e7209c22e1abfbc9f43989..6dd89ba05172ff08bc344f9c91eeeaac69c55705 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -58,7 +58,7 @@ $(NLM_NAME)_LINKOPT_DEPENDS   = \
                                $(EOLIST)
 
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
-LIB_NAME                                       = $(basename $(notdir $(TARGET_lib)))
+LIB_NAME                       = $(basename $(notdir $(TARGET_lib)))
 $(LIB_NAME)_LIBLST_DEPENDS     = \
                                $(FILES_lib_objs) \
                                $(AP_WORK)\build\NWGNUenvironment.inc \
@@ -82,17 +82,20 @@ endif
 # Generic compiler rules
 #
 
-$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(AP_WORK)/build/NWGNUversion.inc : $(AP_WORK)/build/nw_ver.awk $(AP_WORK)/include/ap_release.h
        @echo Generating $(subst /,\,$@)
-       $(AWK) -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc
+       $(AWK) -f $^ > $@
 
 -include $(AP_WORK)\build\NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc
 else
-VERSION                = 2,0,0
-VERSION_STR    = 2.0.0
+VERSION                = 2,3,0
+VERSION_STR    = 2.3.0
+endif
+VERSION_MAJMIN = 23
 endif
 
 

diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 6ef31b626b5bf2d19450fb45f0911d2e213729bf..526d46a4f020f3738b63706080109bad4e7b3096 100644 (file)
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -18,7 +18,7 @@
 # based on Ryan Bloom's make_export.pl
 
 BEGIN {
-    printf(" (APACHE2)\n")
+    printf(" ("EXPPREFIX")\n")
 }
 
 # List of functions that we don't support, yet??