Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 54378 invoked from network); 18 Dec 2007 21:38:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Dec 2007 21:38:37 -0000 Received: (qmail 3752 invoked by uid 500); 18 Dec 2007 21:38:26 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 3703 invoked by uid 500); 18 Dec 2007 21:38:26 -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 3692 invoked by uid 99); 18 Dec 2007 21:38:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 13:38:26 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 21:38:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 499731A983E; Tue, 18 Dec 2007 13:38:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r605332 - /httpd/mod_ftp/trunk/Makefile.apxs Date: Tue, 18 Dec 2007 21:38:08 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071218213808.499731A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Tue Dec 18 13:38:06 2007 New Revision: 605332 URL: http://svn.apache.org/viewvc?rev=605332&view=rev Log: Annotate the generate-docs target, and ensure non-committers can perform this step. 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=605332&r1=605331&r2=605332&view=diff ============================================================================== --- httpd/mod_ftp/trunk/Makefile.apxs (original) +++ httpd/mod_ftp/trunk/Makefile.apxs Tue Dec 18 13:38:06 2007 @@ -68,26 +68,28 @@ ( mv $(httpd_conffile) $(httpd_conffile).bak && \ mv $(httpd_conffile).new $(httpd_conffile) ); -svnroot=https://svn.apache.org/repos/asf +svnroot=http://svn.apache.org/repos/asf/httpd manualdir=$(ftp_srcdir)/docs/manual +# Note; by default, make generate-docs rebuilds the local pages +# To regenerate the installed pages (after using make install to +# drop in the ftp content), simply +# +# make manualdir=/path/to/manual generate-docs +# generate-docs: @if test ! -d $(manualdir)/build; then \ cd $(manualdir); \ - svn export $(svnroot)/httpd/docs-build/trunk build; \ + svn export $(svnroot)/docs-build/trunk build; \ fi @if test ! -d $(manualdir)/style; then \ cd $(manualdir); \ - svn export $(svnroot)/httpd/httpd/branches/2.2.x/docs/manual/style; \ + svn export $(svnroot)/httpd/branches/2.2.x/docs/manual/style; \ fi cd $(manualdir)/build; \ ./build.sh all generate-dox: - @if test ! -f $(ftp_srcdir)/docs/doxygen.conf; then \ - cd $(ftp_srcdir)/docs; \ - svn export $(svnroot)/httpd/httpd/branches/2.2.x/docs/doxygen.conf; \ - fi cd $(ftp_srcdir); \ doxygen $(ftp_srcdir)/docs/doxygen-ftp.conf