diff options
| author | Tom Yu <tlyu@mit.edu> | 2012-10-19 16:03:57 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-11-14 14:09:03 -0500 |
| commit | 3f7aebe3f77fc99200f863f66c064614509d7882 (patch) | |
| tree | f7e61b760a4f438b46601855148e9b721ebdad73 /src/doc/Makefile.in | |
| parent | 07c77b51d33c23d3ea28d588adc43b6c5ec5c20f (diff) | |
| download | krb5-3f7aebe3f77fc99200f863f66c064614509d7882.tar.gz krb5-3f7aebe3f77fc99200f863f66c064614509d7882.tar.xz krb5-3f7aebe3f77fc99200f863f66c064614509d7882.zip | |
Use main conf.py for NOTICE
Generate the NOTICE file using the main conf.py, by using a special
tag when invoking sphinx-build.
While here, add notice.txt to the list of files removed by make clean.
ticket: 7433
tags: pullup
Diffstat (limited to 'src/doc/Makefile.in')
| -rw-r--r-- | src/doc/Makefile.in | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index 2413068645..913a50a934 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -26,8 +26,7 @@ RST_SOURCES= _static \ mitK5license.rst \ notice.rst \ relay \ - resources.rst \ - txt_conf.py + resources.rst # Create HTML documentation in $(docsrc)/html suitable for a # release tarball or the web site (that is, without substitutions for @@ -48,8 +47,8 @@ substhtml: composite paths.py $(SPHINX_BUILD) -t pathsubs -q rst_composite html_subst # Create an ASCII (okay, UTF-8) version of the NOTICE file -notice.txt: rst_notice - $(SPHINX_BUILD) -b text -q rst_notice . +notice.txt: $(docsrc)/conf.py $(docsrc)/notice.rst + $(SPHINX_BUILD) -b text -t notice -q $(docsrc) . NOTICE: notice.txt cp notice.txt $(top_srcdir)/../NOTICE @@ -72,16 +71,6 @@ composite: Doxyfile $(docsrc)/version.py cp rst_apiref/macros/*.rst rst_composite/appldev/refs/macros cp $(docsrc)/version.py rst_composite -# Must use a separate source dir for sphinx text builds, since the text -# engine cannot handle the row spanning cells in fancy tables that we use -rst_notice: $(docsrc)/notice.rst $(docsrc)/txt_conf.py $(docsrc)/version.py - mkdir -p rst_notice - # reST needs backslashes before parens in this macro definition. - sed -e 's/include:: <isonum.txt>/|copy| replace:: \\(C\\)/' \ - < $(docsrc)/notice.rst > rst_notice/notice.rst - cp $(docsrc)/txt_conf.py rst_notice/conf.py - cp $(docsrc)/version.py rst_notice - Doxyfile: $(srcdir)/Doxyfile.in sed -e 's|@SRC@|$(top_srcdir)|g' \ -e 's|@DOC@|$(top_srcdir)/../doc|g' $(srcdir)/Doxyfile.in > $@ @@ -106,4 +95,4 @@ $(docsrc)/version.py: $(top_srcdir)/patchlevel.h $(srcdir)/version.py.in clean:: rm -rf doxy rst_apiref rst_composite rst_notice html_subst \ - Doxyfile paths.py $(docsrc)/version.py + Doxyfile paths.py $(docsrc)/version.py notice.txt |