From: Guenter Knauf <fuankg@apache.org>
Date: Fri, 17 Jul 2009 16:03:10 +0000 (+0000)
Subject: bachkport fix for Netware exports prefixing.
X-Git-Tag: 2.2.12~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c6308b89d9ea0ec4739d443a531dcbf57ffc2eb;p=thirdparty%2Fapache%2Fhttpd.git

bachkport fix for Netware exports prefixing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@795127 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 423a73d9e15..c99c95d86aa 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -27,7 +27,7 @@ nlms :: $(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 /,\,$@)
@@ -67,7 +67,6 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 # installation area
 #
 install :: nlms FORCE
-	
 
 clean ::
 	$(CHK) nw_export.i                                  $(DEL) nw_export.i
@@ -77,4 +76,11 @@ clean ::
 	$(CHK) $(subst /,\,$(PCRE))\pcre.h                  $(DEL) $(subst /,\,$(PCRE))\pcre.h
 	$(CHK) $(subst /,\,$(NWOS))\httpd.imp               $(DEL) $(subst /,\,$(NWOS))\httpd.imp
 	$(MAKE) -C $(APR) -f NWGNUmakefile clean
+
+#
+# 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/make_nw_export.awk b/build/make_nw_export.awk
index b958903cb22..ca6e6a07029 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??