svn commit: r822480 - /httpd/mod_fcgid/trunk/Makefile-fcgid.win

[wr...@apache.org]

Author: wrowe
Date: Tue Oct  6 20:30:09 2009
New Revision: 822480

URL: http://svn.apache.org/viewvc?rev=822480&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_fcgid/trunk/Makefile-fcgid.win

Modified: httpd/mod_fcgid/trunk/Makefile-fcgid.win
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile-fcgid.win?rev=822480&r1=822479&r2=822480&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile-fcgid.win (original)
+++ httpd/mod_fcgid/trunk/Makefile-fcgid.win Tue Oct  6 20:30:09 2009
@@ -21,7 +21,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\fcgid\mod_fcgid.vcproj") \
     && ([devenv /help > NUL 2>&1] == 0) \
@@ -43,11 +45,9 @@
 CTARGET=/build
 !ENDIF
 
-!IF "$(INSTDIR)" == ""
-INSTDIR=\Apache22
-!ENDIF
-
+!IF "$(APACHE2_HOME)" == ""
 APACHE2_HOME=$(INSTDIR)
+!ENDIF
 
 !IF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
 APACHE2_APRSFX=-1
@@ -61,7 +61,8 @@
 
 !IF "$(LONG)" == ""
 !MESSAGE
-!MESSAGE INSTDIR     = $(INSTDIR)
+!MESSAGE INSTDIR      = $(INSTDIR)
+!MESSAGE APACHE2_HOME = $(APACHE2_HOME)
 !MESSAGE
 !MESSAGE To change these options use 'nmake -f Makefile-fcgid.win [option=value]'
 !MESSAGE Example: nmake -f Makefile-fcgid.win