svn commit: r822481 - /httpd/mod_ftp/trunk/Makefile-ftp.win

[wr...@apache.org]

Author: wrowe
Date: Tue Oct  6 20:30:32 2009
New Revision: 822481

URL: http://svn.apache.org/viewvc?rev=822481&view=rev
Log:
Protect envvar values of INSTDIR, APACHE2_HOME, and report APACHE2_HOME
for the user inspecting the build-time variables.

Submitted by: rjung

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=822481&r1=822480&r2=822481&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Tue Oct  6 20:30:32 2009
@@ -25,7 +25,9 @@
 # so the server root should be given in forward slashes (quoted),
 # preferably with the drive designation!
 
+!IF "$(INSTDIR)" == ""
 INSTDIR=\Apache22
+!ENDIF
 
 !IF EXIST("modules\ftp\mod_ftp.vcproj") \
     && ([devenv /help > NUL 2>&1] == 0) \
@@ -47,7 +49,9 @@
 CTARGET=/build
 !ENDIF
 
+!IF "$(APACHE2_HOME)" == ""
 APACHE2_HOME=$(INSTDIR)
+!ENDIF
 
 !IF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
 APACHE2_APRSFX=-1
@@ -59,9 +63,6 @@
 !MESSAGE include apr and apr-util.  mod_ftp cannot build without these files!
 !ENDIF
 
-!IF "$(INSTDIR)" == ""
-INSTDIR=\Apache22
-!ENDIF
 !IF "$(DOMAINNAME)" == ""
 DOMAINNAME=example.com
 !ENDIF 
@@ -77,11 +78,12 @@
 
 !IF "$(LONG)" == ""
 !MESSAGE
-!MESSAGE INSTDIR     = $(INSTDIR)
-!MESSAGE DOMAINNAME  = $(DOMAINNAME)
-!MESSAGE SERVERNAME  = $(SERVERNAME)
-!MESSAGE SERVERADMIN = $(SERVERADMIN)
-!MESSAGE FTPPORT     = $(FTPPORT)
+!MESSAGE INSTDIR      = $(INSTDIR)
+!MESSAGE APACHE2_HOME = $(APACHE2_HOME)
+!MESSAGE DOMAINNAME   = $(DOMAINNAME)
+!MESSAGE SERVERNAME   = $(SERVERNAME)
+!MESSAGE SERVERADMIN  = $(SERVERADMIN)
+!MESSAGE FTPPORT      = $(FTPPORT)
 !MESSAGE
 !MESSAGE To change these options use 'nmake -f Makefile-ftp.win [option=value]'
 !MESSAGE Example: nmake -f Makefile-ftp.win FTPPORT=8021