httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r795127 - in /httpd/httpd/branches/2.2.x/build: NWGNUmakefile make_nw_export.awk
Date Fri, 17 Jul 2009 16:03:10 GMT
Author: fuankg
Date: Fri Jul 17 16:03:10 2009
New Revision: 795127

URL: http://svn.apache.org/viewvc?rev=795127&view=rev
Log:
bachkport fix for Netware exports prefixing.

Modified:
    httpd/httpd/branches/2.2.x/build/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/make_nw_export.awk

Modified: httpd/httpd/branches/2.2.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUmakefile?rev=795127&r1=795126&r2=795127&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUmakefile Fri Jul 17 16:03:10 2009
@@ -27,7 +27,7 @@
 
 $(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 @@
 # installation area
 #
 install :: nlms FORCE
-	
 
 clean ::
 	$(CHK) nw_export.i                                  $(DEL) nw_export.i
@@ -77,4 +76,11 @@
 	$(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
     

Modified: httpd/httpd/branches/2.2.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/make_nw_export.awk?rev=795127&r1=795126&r2=795127&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/make_nw_export.awk (original)
+++ httpd/httpd/branches/2.2.x/build/make_nw_export.awk Fri Jul 17 16:03:10 2009
@@ -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??



Mime
View raw message