Format pass over RST documentation

[krb5.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index cfa02c5d5307553ee7ce8d70140d1c2497477384..0b8cd45d7176340679822a303f3c9882c8dcd327 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 SRCDIR=../src
-DVI=texi2dvi4a2ps      # texi2dvi
+DVI=texi2dvi
 DVIPS=dvips -o "$@"
 PSPDF=ps2pdf
 INFO=makeinfo
@@ -9,7 +9,8 @@ TAR=tar -chvf
 GZIP=gzip -9
 MANPS=./man2ps
 MANTXT=nroff -man 
-MANHTML=./man2html
+PERL=perl
+MANHTML=$(PERL) man2html
 
 ADMIN_INCLUDES=definitions.texinfo copyright.texinfo document-list.texinfo \
        glossary.texinfo support-enc.texinfo salts.texinfo krb5conf.texinfo \
@@ -21,11 +22,13 @@ INSTALL_INCLUDES=definitions.texinfo copyright.texinfo document-list.texinfo \
        krb5conf.texinfo kdcconf.texinfo send-pr.texinfo
 INSTALL_DEPS=install.texinfo $(INSTALL_INCLUDES)
 
-MANPAGES=$(SRCDIR)/appl/gssftp/ftp/ftp.M $(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/appl/bsd/rcp.M $(SRCDIR)/appl/bsd/rlogin.M $(SRCDIR)/appl/bsd/rsh.M $(SRCDIR)/appl/telnet/telnet/telnet.1 $(SRCDIR)/clients/kpasswd/kpasswd.M
+MANPAGES=$(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/clients/kpasswd/kpasswd.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
 
@@ -33,7 +36,7 @@ all:: admin-guide-full install-guide-full user-guide-full clean-temp-ps clean-te
 admin-guide-full:: admin-guide admin-guide-info admin-guide-html
 
 .PHONY: admin-guide
-admin-guide:: admin-guide.ps
+admin-guide:: admin-guide.ps admin-guide.pdf
 
 admin-guide.ps: $(ADMIN_DEPS)
        $(DVI) admin.texinfo
@@ -58,7 +61,7 @@ krb5-admin.info: $(ADMIN_DEPS)
 install-guide-full:: install-guide install-guide-info install-guide-html
 
 .PHONY: install-guide
-install-guide:: install-guide.ps
+install-guide:: install-guide.ps install-guide.pdf
 
 install-guide.ps: $(INSTALL_DEPS)
        $(DVI) install.texinfo
@@ -83,7 +86,7 @@ krb5-install.info: $(INSTALL_DEPS)
 user-guide-full:: user-guide user-guide-info user-guide-html
 
 .PHONY: user-guide
-user-guide:: user-guide.ps
+user-guide:: user-guide.ps user-guide.pdf
 
 user-guide.ps: $(USER_GUIDE_DEPS)
        $(DVI) user-guide.texinfo
@@ -103,15 +106,10 @@ krb5-user.info: $(USER_GUIDE_DEPS)
 user-guide-html:: user-guide.html
 
 user-guide.html: $(USER_GUIDE_DEPS)
-       $(MANTXT) $(SRCDIR)/appl/gssftp/ftp/ftp.M | $(MANHTML) > ftp.html
        $(MANTXT) $(SRCDIR)/clients/kdestroy/kdestroy.M | $(MANHTML) > kdestroy.html
        $(MANTXT) $(SRCDIR)/clients/kinit/kinit.M | $(MANHTML) > kinit.html
        $(MANTXT) $(SRCDIR)/clients/klist/klist.M | $(MANHTML) > klist.html
        $(MANTXT) $(SRCDIR)/clients/ksu/ksu.M | $(MANHTML) > ksu.html
-       $(MANTXT) $(SRCDIR)/appl/bsd/rcp.M | $(MANHTML) > rcp.html
-       $(MANTXT) $(SRCDIR)/appl/bsd/rlogin.M | $(MANHTML) > rlogin.html
-       $(MANTXT) $(SRCDIR)/appl/bsd/rsh.M | $(MANHTML) > rsh.html
-       $(MANTXT) $(SRCDIR)/appl/telnet/telnet/telnet.1 | $(MANHTML) > telnet.html
        $(MANTXT) $(SRCDIR)/clients/kpasswd/kpasswd.M | $(MANHTML) > kpasswd.html
        $(HTML) user-guide.texinfo              
 
@@ -156,3 +154,19 @@ tgz::
        $(TAR) krb5-docs.tar admin.texinfo build.texinfo copyright.texinfo definitions.texinfo document-list.texinfo glossary.texinfo install.texinfo texinfo.tex user-guide.texinfo *-guide.ps *.info *.info-? *.html
        $(GZIP) krb5-docs.tar
        $(MV) krb5-docs.tar.gz krb5-docs.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)