Author: fuankg
Date: Wed Jul 1 17:24:16 2009
New Revision: 790281
URL: http://svn.apache.org/viewvc?rev=790281&view=rev
Log:
few NetWare build improvements.
Modified:
apr/apr/branches/1.4.x/build/NWGNUenvironment.inc
apr/apr/branches/1.4.x/build/NWGNUtail.inc
Modified: apr/apr/branches/1.4.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUenvironment.inc?rev=790281&r1=790280&r2=790281&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/1.4.x/build/NWGNUenvironment.inc Wed Jul 1 17:24:16 2009
@@ -111,6 +111,9 @@
LINK = mwldnlm
LIB = mwldnlm -type library -w nocmdline
+# Setup build tools
+AWK = awk
+
ifdef IPV6
ifndef USE_STDSOCKETS
USE_STDSOCKETS=1
@@ -227,28 +230,19 @@
INSTALLBASE := $(INSTALL)\$(BASEDIR)
-INSTDEVDIRS := \
- $(INSTDIRS) \
- $(INSTALLBASE) \
- $(INSTALLBASE)\include \
- $(INSTALLBASE)\lib \
-
-INSTDIRS += \
- $(INSTALLBASE) \
-
else
+
INSTALLBASE := $(INSTALL)\apr
-INSTDEVDIRS := \
- $(INSTDIRS) \
- $(INSTALLBASE) \
- $(INSTALLBASE)\include \
- $(INSTALLBASE)\lib \
+endif
INSTDIRS += \
- $(INSTALLBASE) \
-
-endif
+ $(INSTALLBASE)
+
+INSTDEVDIRS := \
+ $(INSTDIRS) \
+ $(INSTALLBASE)\include \
+ $(INSTALLBASE)\lib
#
# Declare Command and tool macros here
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=790281&r1=790280&r2=790281&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/NWGNUtail.inc (original)
+++ apr/apr/branches/1.4.x/build/NWGNUtail.inc Wed Jul 1 17:24:16 2009
@@ -83,9 +83,10 @@
# Generic compiler rules
#
-$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h
@echo Generating $(subst /,\,$@)
- awk -f $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h > $(APR_WORK)\build\NWGNUversion.inc
+ @$(AWK) -f $^ > $@
-include $(APR_WORK)\build\NWGNUversion.inc
@@ -95,6 +96,7 @@
VERSION = 1,0,0
VERSION_STR = 1.0.0
endif
+endif
ifeq "$(words $(strip $(TARGET_nlm)))" "1"
INCLUDE_BLDCMDS=1
|