httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822504 - /httpd/mod_fcgid/trunk/Makefile-fcgid.win
Date Tue, 06 Oct 2009 21:15:03 GMT
Author: wrowe
Date: Tue Oct  6 21:15:03 2009
New Revision: 822504

URL: http://svn.apache.org/viewvc?rev=822504&view=rev
Log:
When installing into a tree with no existing httpd.conf, don't spend our effort
to document two lines of LoadModule mod_foo or the Include extra/foo.conf'let

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=822504&r1=822503&r2=822504&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile-fcgid.win (original)
+++ httpd/mod_fcgid/trunk/Makefile-fcgid.win Tue Oct  6 21:15:03 2009
@@ -185,22 +185,26 @@
 !IFDEF HAVE_MOD_FCGID_H
 	copy include\mod_fcgid.h "$(INSTDIR)\include" < .y > nul
 !ENDIF
-	-awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
-	     -v LIBPATH=modules \
+	if exist "$(httpd_origconffile)" ( \
+	    awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
+		-v LIBPATH=modules \
 !IFDEF HAVE_HTTPD_FCGID_CONF
-	     -v EXAMPLECONF=conf/extra/httpd_fcgid.conf \
+		-v EXAMPLECONF=conf/extra/httpd_fcgid.conf \
 !ENDIF
-	     "$(httpd_origconffile)" > "$(httpd_origconffile).new" && \
-	  ( move "$(httpd_origconffile)" "$(httpd_origconffile).bak" && \
-	    move "$(httpd_origconffile).new" $(httpd_origconffile) )
-	-awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
-	     -v LIBPATH=modules \
+		"$(httpd_origconffile)" > "$(httpd_origconffile).new" && \
+	    move "$(httpd_origconffile)" "$(httpd_origconffile).bak" && \
+	    move "$(httpd_origconffile).new" $(httpd_origconffile) \
+	)
+	if exist "$(httpd_conffile)" ( \
+	    awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
+		-v LIBPATH=modules \
 !IFDEF HAVE_HTTPD_FCGID_CONF
-	     -v EXAMPLECONF=conf/extra/httpd_fcgid.conf \
+		-v EXAMPLECONF=conf/extra/httpd_fcgid.conf \
 !ENDIF
-	     "$(httpd_conffile)" > "$(httpd_conffile).new" && \
-	  ( move "$(httpd_conffile)" "$(httpd_conffile).bak" && \
-	    move "$(httpd_conffile).new" $(httpd_conffile) )
+		"$(httpd_conffile)" > "$(httpd_conffile).new" && \
+	    move "$(httpd_conffile)" "$(httpd_conffile).bak" && \
+	    move "$(httpd_conffile).new" $(httpd_conffile) \
+	)
 !IFDEF HAVE_HTTPD_FCGID_CONF
 	copy docs\conf\extra\httpd_fcgid.conf "$(INSTDIR)\conf\original\extra\httpd_fcgid.conf"
<.y
 	awk -f << docs\conf\extra\httpd_fcgid.conf > "$(INSTDIR)\conf\original\extra\httpd_fcgid.conf"



Mime
View raw message