httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822543 - /httpd/mod_ftp/trunk/Makefile-ftp.win
Date Wed, 07 Oct 2009 00:48:32 GMT
Author: wrowe
Date: Wed Oct  7 00:48:32 2009
New Revision: 822543

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

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=822543&r1=822542&r2=822543&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Wed Oct  7 00:48:32 2009
@@ -217,20 +217,13 @@
 	xcopy docs\ftproot     "$(INSTDIR)\ftpdocs" /d < .a
 	xcopy docs\manual      "$(INSTDIR)\manual" /s /d < .a
 	copy include\mod_ftp.h "$(INSTDIR)\include" < .y > nul
-	if exist "$(httpd_origconffile)" ( \
-	    awk -f build/addloadexample.awk -v MODULE=ftp -v DSO=.so \
-		-v LIBPATH=modules -v EXAMPLECONF=conf/extra/ftpd.conf \
-		"$(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=ftp -v DSO=.so \
-		-v LIBPATH=modules -v EXAMPLECONF=conf/extra/ftpd.conf \
-		"$(httpd_conffile)" > "$(httpd_conffile).new" && \
-	    move "$(httpd_conffile)" "$(httpd_conffile).bak" && \
-	    move "$(httpd_conffile).new" $(httpd_conffile) \
-	)
+	for %f in ("$(httpd_origconffile)" "$(httpd_conffile)") do \
+	    if exist "%f" ( \
+		awk -f build/addloadexample.awk -v MODULE=ftp -v DSO=.so \
+		    -v LIBPATH=modules -v EXAMPLECONF=conf/extra/ftpd.conf \
+		    "%f" > "%f.new" && \
+		move "%f" "%f.bak" && move "%f.new" "%f" \
+	    )
 	copy docs\conf\extra\ftpd.conf "$(INSTDIR)\conf\original\extra\ftpd.conf" <.y
 	awk -f << docs\conf\extra\ftpd.conf > "$(INSTDIR)\conf\original\extra\ftpd.conf"
 /^\#@@LoadFtpModules@@/ { next; }



Mime
View raw message