svn commit: r291485 - in /httpd/httpd/branches/2.2.x: Makefile.in build/rules.mk.in

[pq...@apache.org]

Author: pquerna
Date: Sun Sep 25 16:07:27 2005
New Revision: 291485

URL: http://svn.apache.org/viewcvs?rev=291485&view=rev
Log:
Merge r291480 from trunk:

* Makefile.in
  (docs): If the "docs-build" project is available, trigger its build system
   to turn the XML sources into HTML.  Otherwise, display a URL to the
   instructions on how to use the docs build.

* build/rules.mk.in:
  (.PHONEY): docs is a fake target.

Submitted By: Daniel Rall <dlr apache.org>
Reviewed by: pquerna

Modified:
    httpd/httpd/branches/2.2.x/Makefile.in
    httpd/httpd/branches/2.2.x/build/rules.mk.in

Modified: httpd/httpd/branches/2.2.x/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.in?rev=291485&r1=291484&r2=291485&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.in (original)
+++ httpd/httpd/branches/2.2.x/Makefile.in Sun Sep 25 16:07:27 2005
@@ -105,11 +105,15 @@
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
 
-docs::
-	mkdir -p ./docs/api
-	srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
+docs:
+	@if test -d $(top_srcdir)/docs/manual/build; then \
+	    cd $(top_srcdir)/docs/manual/build && ./build.sh; \
+	else \
+	    echo 'For details on generating the docs, please read:'; \
+	    echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
+	fi
 
-dox::
+dox:
 	doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:

Modified: httpd/httpd/branches/2.2.x/build/rules.mk.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/build/rules.mk.in?rev=291485&r1=291484&r2=291485&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/rules.mk.in (original)
+++ httpd/httpd/branches/2.2.x/build/rules.mk.in Sun Sep 25 16:07:27 2005
@@ -229,5 +229,5 @@
 	clean clean-recursive local-clean x-local-clean \
 	distclean distclean-recursive local-distclean x-local-distclean \
 	extraclean extraclean-recursive local-extraclean x-local-extraclean \
-	install local-install $(INSTALL_TARGETS)
+	install local-install docs $(INSTALL_TARGETS)