You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2009/07/17 17:17:24 UTC
svn commit: r795110 - in /apr/apr/branches/1.4.x/build: NWGNUmakefile
NWGNUtail.inc make_nw_export.awk
Author: fuankg
Date: Fri Jul 17 15:17:22 2009
New Revision: 795110
URL: http://svn.apache.org/viewvc?rev=795110&view=rev
Log:
bachkport fix for Netware exports prefixing.
Modified:
apr/apr/branches/1.4.x/build/NWGNUmakefile
apr/apr/branches/1.4.x/build/NWGNUtail.inc
apr/apr/branches/1.4.x/build/make_nw_export.awk
Modified: apr/apr/branches/1.4.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUmakefile?rev=795110&r1=795109&r2=795110&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/NWGNUmakefile (original)
+++ apr/apr/branches/1.4.x/build/NWGNUmakefile Fri Jul 17 15:17:22 2009
@@ -30,7 +30,7 @@
$(APR)/aprlib.imp : make_nw_export.awk nw_export.i
@echo Generating $(subst /,\,$@)
- awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp
+ $(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | sort >$@
nw_export.i : nw_export.inc $(APRUTIL)/build/nw_apu_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
@echo Generating $(subst /,\,$@)
@@ -55,27 +55,27 @@
$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APR))\include\$(@F)
+ $(CP) $< $(subst /,\,$(APR))\include\$(@F)
$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hnw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
+ $(CP) $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
+ $(CP) $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
$(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\include\$(@F)
+ $(CP) $< $(subst /,\,$(APRUTIL))\include\$(@F)
$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
+ $(CP) $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.h.in
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
+ $(CP) $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
#
# You can use this target if all that is needed is to copy files to the
Modified: apr/apr/branches/1.4.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUtail.inc?rev=795110&r1=795109&r2=795110&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/NWGNUtail.inc (original)
+++ apr/apr/branches/1.4.x/build/NWGNUtail.inc Fri Jul 17 15:17:22 2009
@@ -93,8 +93,9 @@
ifneq "$(strip $(VERSION_STR))" ""
VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
else
-VERSION = 1,0,0
-VERSION_STR = 1.0.0
+VERSION = 1,4,0
+VERSION_STR = 1.4.0
+VERSION_MAJMIN = 14
endif
endif
Modified: apr/apr/branches/1.4.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/make_nw_export.awk?rev=795110&r1=795109&r2=795110&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/make_nw_export.awk (original)
+++ apr/apr/branches/1.4.x/build/make_nw_export.awk Fri Jul 17 15:17:22 2009
@@ -2,7 +2,7 @@
# based on Ryan Bloom's make_export.pl
BEGIN {
- printf(" (APRLIB)\n")
+ printf(" ("EXPPREFIX")\n")
}
# List of functions that we don't support, yet??