summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-03-28 02:03:45 +0000
committerGreg Hudson <ghudson@mit.edu>2012-03-28 02:03:45 +0000
commit2e0b389f84baf224d259247feced6f3b9741e3b0 (patch)
treea97e4668f251538eb1c490f51916731fd1b2a356 /doc
parent34535574e95c1003ea63540fbf8c2c62fe155e02 (diff)
downloadkrb5-2e0b389f84baf224d259247feced6f3b9741e3b0.tar.gz
krb5-2e0b389f84baf224d259247feced6f3b9741e3b0.tar.xz
krb5-2e0b389f84baf224d259247feced6f3b9741e3b0.zip
Move rstman build target to man directory
rstman makes more sense in man than in doc, so move it there. Remove the rstman target from the top-level doc Makefile to avoid confusion. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25792 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile15
-rw-r--r--doc/rst_source/relay/build_this.rst7
2 files changed, 6 insertions, 16 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 0b8cd45d71..599da3f6cf 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -27,8 +27,6 @@ MANPAGES=$(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $
USER_GUIDE_INCLUDES=definitions.texinfo copyright.texinfo glossary.texinfo
USER_GUIDE_DEPS=user-guide.texinfo $(USER_GUIDE_INCLUDES)
-SPHINX_BUILD=sphinx-build
-
.PHONY: all
all:: admin-guide-full install-guide-full user-guide-full clean-temp-ps clean-tex
@@ -157,16 +155,3 @@ tgz::
../NOTICE: notice.texinfo definitions.texinfo copyright.texinfo
makeinfo --plaintext -o $@ notice.texinfo
-
-RSTMAN=k5identity.5 k5login.5 k5srvutil.1 kadmin.1 kadmind.8 kdb5_ldap_util.8 \
- kdb5_util.8 kdc.conf.5 kdestroy.1 kinit.1 klist.1 kpasswd.1 kprop.8 \
- kpropd.8 kproplog.8 krb5.conf.5 krb5kdc.8 ksu.1 kswitch.1 ktutil.1 \
- kvno.1
-
-# The file editing loop deletes some trailing whitespace that the
-# docutils manpage writer outputs near the end of its output files.
-rstman::
- $(SPHINX_BUILD) -q -b man rst_source ../src/man
- (cd ../src/man && for f in $(RSTMAN); do \
- (echo '$$'; echo '?^.." $$?d'; echo 'w'; echo 'q' ) | ed $$f; \
- done)
diff --git a/doc/rst_source/relay/build_this.rst b/doc/rst_source/relay/build_this.rst
index 233ec75c88..4eda5d0506 100644
--- a/doc/rst_source/relay/build_this.rst
+++ b/doc/rst_source/relay/build_this.rst
@@ -31,7 +31,12 @@ Updating man pages
Man pages generated from the RST sources, are checked into the src/man
directory. To regenerate these files, run ``make rstman`` from the
-doc subdir of a configured build tree.
+man subdirectory of a configured build tree. You can also do this
+from an unconfigured source tree with::
+
+ cd src/man
+ make -f Makefile.in top_srcdir=.. srcdir=. rstman
+ make clean
As with the simple build, it is normal to see warnings about missing
files when rebuilding the man pages.