svn rev #25792: trunk/ doc/ doc/rst_source/relay/ src/doc/ src/man/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25792
Commit By: ghudson
Log Message:
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.


Changed Files:
U   trunk/doc/Makefile
U   trunk/doc/rst_source/relay/build_this.rst
U   trunk/src/doc/Makefile.in
U   trunk/src/man/Makefile.in
Modified: trunk/doc/Makefile
===================================================================
--- trunk/doc/Makefile	2012-03-28 02:03:33 UTC (rev 25791)
+++ trunk/doc/Makefile	2012-03-28 02:03:45 UTC (rev 25792)
@@ -27,8 +27,6 @@
 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 @@
 
 ../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)

Modified: trunk/doc/rst_source/relay/build_this.rst
===================================================================
--- trunk/doc/rst_source/relay/build_this.rst	2012-03-28 02:03:33 UTC (rev 25791)
+++ trunk/doc/rst_source/relay/build_this.rst	2012-03-28 02:03:45 UTC (rev 25792)
@@ -31,8 +31,13 @@
 
 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.
 

Modified: trunk/src/doc/Makefile.in
===================================================================
--- trunk/src/doc/Makefile.in	2012-03-28 02:03:33 UTC (rev 25791)
+++ trunk/src/doc/Makefile.in	2012-03-28 02:03:45 UTC (rev 25792)
@@ -5,18 +5,7 @@
 DOXYGEN=doxygen
 
 docsrc=$(top_srcdir)/../doc
-mansrc=$(top_srcdir)/man
 
-# The file editing loop deletes some trailing whitespace that the
-# docutils manpage writer outputs near the end of its output files.
-rstman::
-	$(RM) -r mantmp && mkdir mantmp
-	$(SPHINX_BUILD) -q -t mansubs -b man $(docsrc)/rst_source mantmp
-	for f in mantmp/*.[0-9]; do \
-		name=`echo $$f | sed -e 's|^.*/\(.*\)\.[0-9]$$|\1|'`; \
-		sed -e '/^\.\\" $$/d' $$f > $(mansrc)/$$name.man; \
-	done
-
 # Create HTML documentation in $(docsrc)/rst_html suitable for a
 # release tarball or the web site (that is, without substitutions for
 # configured paths).  This can be done in an unconfigured source tree
@@ -47,4 +36,4 @@
 	    -e 's|@DOC@|$(top_srcdir)/../doc|g' $(srcdir)/Doxyfile.in > $@
 
 clean::
-	rm -rf rst_man doxy rst_apiref rst_composite Doxyfile
+	rm -rf doxy rst_apiref rst_composite Doxyfile

Modified: trunk/src/man/Makefile.in
===================================================================
--- trunk/src/man/Makefile.in	2012-03-28 02:03:33 UTC (rev 25791)
+++ trunk/src/man/Makefile.in	2012-03-28 02:03:45 UTC (rev 25792)
@@ -1,6 +1,7 @@
 mydir=man
 BUILDTOP=$(REL)..
 
+SPHINX_BUILD=sphinx-build
 GROFF=@GROFF@
 GROFF_MAN=$(GROFF) -mtty-char -Tascii -mandoc -c
 localstatedir=@localstatedir@
@@ -10,6 +11,22 @@
 	klist.sub kpasswd.sub kprop.sub kpropd.sub kproplog.sub krb5.conf.sub \
 	krb5kdc.sub ksu.sub kswitch.sub ktutil.sub kvno.sub
 
+docsrc=$(top_srcdir)/../doc
+
+# Update checked-in man pages from RST sources in the top-level doc
+# directory.  This can be done from an unconfigured tree with:
+#     make -f Makefile.in top_srcdir=.. srcdir=. rstman
+#     make -f Makefile.in clean
+# The sed command deletes some trailing whitespace that the docutils
+# manpage writer outputs near the end of its output files.
+rstman:
+	rm -rf rst_man
+	$(SPHINX_BUILD) -q -t mansubs -b man $(docsrc)/rst_source rst_man
+	for f in rst_man/*.[0-9]; do \
+		name=`echo $$f | sed -e 's|^.*/\(.*\)\.[0-9]$$|\1|'`; \
+		sed -e '/^\.\\" $$/d' $$f > $(srcdir)/$$name.man; \
+	done
+
 .SUFFIXES: .man .sub
 
 .man.sub:
@@ -21,7 +38,7 @@
 all:: $(MANSUBS)
 
 clean::
-	$(RM) $(MANSUBS)
+	rm -rf $(MANSUBS) rst_man
 
 install:: install-clientman install-fileman install-adminman install-serverman