[PATCH] unbreak the 'make docs' build target

[Daniel Rall <dl...@apache.org>]

trunk of APR no longer includes a scandoc.pl script (which would seem to be
largely replaced by Doxygen anyhow), resulting in a busted 'make docs'
target.  That target should either be removed, taken over by the Doxygen
target, or trigger a build of the manual (as I've implemented below).


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


--- Makefile.in (revision 280694)
+++ Makefile.in (working copy)
@@ -106,8 +106,12 @@
 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
+       @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::
        doxygen $(top_srcdir)/docs/doxygen.conf

Re: [PATCH] unbreak the 'make docs' build target

[Paul Querna <ch...@force-elite.com>]

Daniel Rall wrote:
> trunk of APR no longer includes a scandoc.pl script (which would seem to be
> largely replaced by Doxygen anyhow), resulting in a busted 'make docs'
> target.  That target should either be removed, taken over by the Doxygen
> target, or trigger a build of the manual (as I've implemented below).
> 

Thanks, committed in r291480.

-Paul