httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822847 - /httpd/mod_ftp/trunk/Makefile.apxs
Date Wed, 07 Oct 2009 18:54:10 GMT
Author: wrowe
Date: Wed Oct  7 18:54:10 2009
New Revision: 822847

URL: http://svn.apache.org/viewvc?rev=822847&view=rev
Log:
reflect trawick's fix r822734 in mod_fcgid for mod_ftp

Modified:
    httpd/mod_ftp/trunk/Makefile.apxs

Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=822847&r1=822846&r2=822847&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Wed Oct  7 18:54:10 2009
@@ -44,14 +44,15 @@
 	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_sysconfdir) \
 			  $(DESTDIR)$(exp_sysconfdir)/original
 	for i in $(DESTDIR)$(httpd_conffile) $(DESTDIR)$(httpd_origconffile); do \
-	    if test -f $$i; then (
-		awk -f $(ftp_srcdir)/build/addloadexample.awk \
+	    if test -f $$i; then \
+		(awk -f $(fcgid_srcdir)/build/addloadexample.awk \
 		    -v MODULE=ftp -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
 		    -v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
 		    $$i > $$i.new && \
-		mv $$i $$i.bak && mv $$i.new $$i \
-	) \
-	fi;
+		 mv $$i $$i.bak && mv $$i.new $$i \
+	        ) || true; \
+	    fi; \
+	done
 	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_sysconfdir)/extra \
 			  $(DESTDIR)$(exp_sysconfdir)/original/extra
 	@cd $(ftp_srcdir)/docs/conf; \



Mime
View raw message