diff options
| author | Guenter Knauf <fuankg@apache.org> | 2009-07-17 15:17:22 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2009-07-17 15:17:22 +0000 |
| commit | cc1bcb085af30897760655147583410626f51f79 (patch) | |
| tree | d4e48e83bb32d9d23ab56fa8c0619c4970a0d081 /build | |
| parent | cd3d8a2d98c00bcd1a037d1b2540555fec2391fc (diff) | |
| download | apr-cc1bcb085af30897760655147583410626f51f79.tar.gz | |
bachkport fix for Netware exports prefixing.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@795110 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUmakefile | 14 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 5 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 1c3f4b1b6..a9d096ef0 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -30,7 +30,7 @@ nlms :: $(APR)/aprlib.imp $(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 @@ endif $(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 diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 53c364b55..47c8bf971 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -93,8 +93,9 @@ $(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\in 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 diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index d49fcbaf1..cf44e5b07 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -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?? |