* 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>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291480 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index c5652549275f08f56f76eb9f4fdb425a53c9f0cf..e55d1d49d9933473b6e88691d1023acd9cd3386d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,11 +105,15 @@ install-build: build/config_vars.out
 
 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:

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 983bdf5156def8bbdef419441868ef2188244f36..b22d3357c1dfa43d5ff64bc9fc4df6f15b7d631e 100644 (file)
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -229,5 +229,5 @@ SHLIB_SUFFIX = so
        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)