From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 6 Jul 2009 19:17:37 +0000 (+0000)
Subject: some NetWare build improvements.
X-Git-Tag: 2.3.3~469
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=601795667909bf9fd81c6cfa713599da94cc9239;p=apache

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 e39ba37e58..50408ca3f0 100644
--- 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 8cd578498b..053cd3c2eb 100644
--- 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 3169f9c826..6dd89ba051 100644
--- 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 6ef31b626b..526d46a4f0 100644
--- 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??