httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822544 - /httpd/mod_fcgid/trunk/Makefile-fcgid.win
Date Wed, 07 Oct 2009 00:48:51 GMT
Author: wrowe
Date: Wed Oct  7 00:48:50 2009
New Revision: 822544

URL: http://svn.apache.org/viewvc?rev=822544&view=rev
Log:
Compress rewriting .conf to a single block

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=822544&r1=822543&r2=822544&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile-fcgid.win (original)
+++ httpd/mod_fcgid/trunk/Makefile-fcgid.win Wed Oct  7 00:48:50 2009
@@ -187,26 +187,15 @@
 !IFDEF HAVE_MOD_FCGID_H
 	copy include\mod_fcgid.h "$(INSTDIR)\include" < .y > nul
 !ENDIF
-	if exist "$(httpd_origconffile)" ( \
-	    awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
-		-v LIBPATH=modules \
+	for %f in ("$(httpd_origconffile)" "$(httpd_conffile)") do \
+	    if exist "%f" ( \
+		awk -f build/addloadexample.awk -v MODULE=fcgid -v DSO=.so \
 !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) \
-	)
-	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 \
-!ENDIF
-		"$(httpd_conffile)" > "$(httpd_conffile).new" && \
-	    move "$(httpd_conffile)" "$(httpd_conffile).bak" && \
-	    move "$(httpd_conffile).new" $(httpd_conffile) \
-	)
+		    -v LIBPATH=modules "%f" > "%f.new" && \
+		move "%f" "%f.bak" && move "%f.new" "%f" \
+	    )
 !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