Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 57222 invoked from network); 7 Oct 2009 18:54:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Oct 2009 18:54:35 -0000 Received: (qmail 31589 invoked by uid 500); 7 Oct 2009 18:54:34 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 31494 invoked by uid 500); 7 Oct 2009 18:54:34 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 31481 invoked by uid 99); 7 Oct 2009 18:54:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 18:54:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 18:54:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9FC6A2388909; Wed, 7 Oct 2009 18:54:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r822847 - /httpd/mod_ftp/trunk/Makefile.apxs Date: Wed, 07 Oct 2009 18:54:10 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091007185410.9FC6A2388909@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; \