You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/10/06 21:16:17 UTC
svn commit: r822440 - /httpd/mod_ftp/trunk/Makefile-ftp.win

Author: wrowe
Date: Tue Oct  6 19:16:17 2009
New Revision: 822440

URL: http://svn.apache.org/viewvc?rev=822440&view=rev
Log:
Carry the INSTDIR/APACHE2_HOME into sub-nmake invocations

Modified:
    httpd/mod_ftp/trunk/Makefile-ftp.win

Modified: httpd/mod_ftp/trunk/Makefile-ftp.win
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile-ftp.win?rev=822440&r1=822439&r2=822440&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Tue Oct  6 19:16:17 2009
@@ -99,16 +99,24 @@
 !ENDIF
 
 _buildr: 
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=R LONG=Release _build
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=R LONG=Release _build
 
 _buildd: 
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=D LONG=Debug   _build
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=D LONG=Debug   _build
 
 installr: 
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=R LONG=Release _build _install
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=R LONG=Release _build _install
 
 installd: 
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=D LONG=Debug   _build _install
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=D LONG=Debug   _build _install
 
 clean:	_cleanr _cleand
 	-if exist Browse\. rd /s Browse < << > nul
@@ -118,10 +126,14 @@
 !IF $(USEMAK) == 1
 
 _cleanr:
-	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=R LONG=Release CTARGET=CLEAN _build
+	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=R LONG=Release CTARGET=CLEAN _build
 
 _cleand:  
-	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=D LONG=Debug   CTARGET=CLEAN _build
+	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=D LONG=Debug   CTARGET=CLEAN _build
 
 _build:
 	echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
@@ -135,10 +147,14 @@
 !ELSEIF $(USESLN) == 1
 
 _cleanr:  
-	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=R LONG=Release CTARGET="/clean" _build
+	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=R LONG=Release CTARGET="/clean" _build
 
 _cleand:  
-	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=D LONG=Debug   CTARGET="/clean" _build
+	$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=D LONG=Debug   CTARGET="/clean" _build
 
 _build:
 	echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
@@ -150,10 +166,14 @@
 !ELSE
 
 _cleanr:  
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=R LONG=Release CTARGET="/CLEAN" _build
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=R LONG=Release CTARGET="/CLEAN" _build
 
 _cleand:  
-	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win SHORT=D LONG=Debug   CTARGET="/CLEAN" _build
+	@$(MAKE) $(MAKEOPT) -f Makefile-ftp.win \
+		INSTDIR="$(INSTDIR)" APACHE2_HOME="$(APACHE2_HOME)" \
+		SHORT=D LONG=Debug   CTARGET="/CLEAN" _build
 
 _build:
 	@echo Building Win32 $(LONG) targets ($(SHORT) suffixes)