apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789178 - in /apr/apr/trunk/build: NWGNUenvironment.inc NWGNUtail.inc
Date Sun, 28 Jun 2009 23:52:07 GMT
Author: fuankg
Date: Sun Jun 28 23:52:07 2009
New Revision: 789178

URL: http://svn.apache.org/viewvc?rev=789178&view=rev
Log:
few more NetWare build tweaks.

Modified:
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUtail.inc

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789178&r1=789177&r2=789178&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jun 28 23:52:07 2009
@@ -192,6 +192,7 @@
 ifndef INSTALL
 INSTALL = $(APR_WORK)\Dist
 INSTDIRS = $(APR_WORK)\Dist
+BASEDIR = Apr
 endif
 
 # Add support for building IPV6 alongside
@@ -218,20 +219,17 @@
 ifndef BASEDIR
 BASEDIR = Apache2
 endif
-INSTALLBASE := $(INSTALL)\$(BASEDIR)
-
-else
-
-INSTALLBASE := $(INSTALL)\apr
 
 endif
 
+INSTALLBASE := $(INSTALL)\$(BASEDIR)
+
 INSTDEVDIRS := \
 	$(INSTDIRS) \
 	$(INSTALLBASE) \
 	$(INSTALLBASE)\include \
 	$(INSTALLBASE)\lib \
-	$(INSTALLBASE)\bin
+	$(INSTALLBASE)\bin 
 
 INSTDIRS += \
 	$(INSTALLBASE)

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=789178&r1=789177&r2=789178&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Jun 28 23:52:07 2009
@@ -112,7 +112,7 @@
 
 $(OBJDIR)/$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
-	@echo CCOPT_DEPENDS=$<
+	@echo CCOPT_DEPENDS=$^
 	@echo Generating $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@
@@ -139,7 +139,7 @@
 
 $(OBJDIR)/cpp.opt: $(CPPOPT_DEPENDS)
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
-	@echo CPPOPT_DEPENDS=$<
+	@echo CPPOPT_DEPENDS=$^
 	@echo Generating $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@



Mime
View raw message