httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822502 - /httpd/mod_ftp/trunk/Makefile-ftp.win
Date Tue, 06 Oct 2009 21:14:48 GMT
Author: wrowe
Date: Tue Oct  6 21:14:48 2009
New Revision: 822502

URL: http://svn.apache.org/viewvc?rev=822502&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_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=822502&r1=822501&r2=822502&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Tue Oct  6 21:14:48 2009
@@ -215,16 +215,20 @@
 	xcopy docs\ftproot     "$(INSTDIR)\ftpdocs" /d < .a
 	xcopy docs\manual      "$(INSTDIR)\manual" /s /d < .a
 	copy include\mod_ftp.h "$(INSTDIR)\include" < .y > nul
-	-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) )
-	-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) )
+	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) \
+	)
 	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