summaryrefslogtreecommitdiffstats
path: root/src/doc
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-10-25 12:51:17 -0400
committerGreg Hudson <ghudson@mit.edu>2012-10-25 12:55:58 -0400
commitdb4f4b55cd93c86909d4aa140df61af71cbc92af (patch)
tree7a515d4497214f4fc29f682d881b769e10d525a4 /src/doc
parent8f43a6f239c31e0e39cd17471d19d761f26869b8 (diff)
downloadkrb5-db4f4b55cd93c86909d4aa140df61af71cbc92af.tar.gz
krb5-db4f4b55cd93c86909d4aa140df61af71cbc92af.tar.xz
krb5-db4f4b55cd93c86909d4aa140df61af71cbc92af.zip
Always rebuild rst_composite in src/doc
Avoid using "rst_composite" as the target name for building the rst_composite directory, since we can't give it proper dependencies. Instead use the target name "composite", which (like "html", "clean", etc.) doesn't correspond to the name of a file or directory created by the build rules.
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index b6a3defdbd..4fcbb67a09 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -35,14 +35,14 @@ RST_SOURCES= _static \
# with:
# make -f Makefile.in srcdir=. top_srcdir=.. PYTHON=python html
# make -f Makefile.in clean
-html: rst_composite
+html: composite
rm -rf $(docsrc)/html
$(SPHINX_BUILD) -q rst_composite $(docsrc)/html
# Create HTML documentation in html_subst suitable for
# installation by an OS package, with substitutions for configured
# paths.
-substhtml: rst_composite paths.py
+substhtml: composite paths.py
rm -rf html_subst
cp paths.py rst_composite
$(SPHINX_BUILD) -t pathsubs -q rst_composite html_subst
@@ -57,7 +57,7 @@ NOTICE: notice.txt
# Use doxygen to generate API documentation, translate it into RST
# format, and then create a composite of $(docsrc)'s RST and the
# generated files in rst_composite. Used by the html and substhtml targets.
-rst_composite: Doxyfile
+composite: Doxyfile
rm -rf doxy rst_apiref rst_composite
$(DOXYGEN)
cwd=`pwd`; cd $(docsrc)/tools && \