Proper building and installation of documentation in the Makefiles.

6 files changed, 18 insertions, 21 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 5737afeb..f88c3205 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,8 +12,8 @@ endif
 .PHONY: prog.sgml bird.sgml
 
 docs: progdocs userdocs
-
-progdocs: prog.html prog.dvi
+progdocs: prog.html prog.ps
+userdocs: bird.html bird.ps
 
 prog.sgml:
 	$(srcdir)/tools/progdoc $(srcdir_abs)
@@ -21,11 +21,12 @@ prog.sgml:
 %.html: %.sgml
 	./sgml2html $<
 
-%.info: %.sgml
-	sgml2info $<
+%.dvi: %.tex
+	latex $<
+	latex $<
 
-%.dvi: %.sgml
-	./sgml2latex $<
+%.ps: %.dvi
+	dvips -D600 -ta4 -o $@ $<
 
 %.tex: %.sgml
 	./sgml2latex --output=tex $<
@@ -37,8 +38,9 @@ progspell: prog.sgml
 	sed -f prog-spell.sed <prog.sgml >prog.spell
 	ispell prog.spell
 
-userdocs: bird.html bird.dvi bird.txt
-
 clean:
-	rm -f *.html *.tex *.dvi *.log *.ps *.txt *.aux *.toc *.spell
+	rm -f *.tex *.dvi *.log *.txt *.aux *.toc *.spell
 	rm -f prog.sgml
+
+distclean: clean
+	rm -f *.html *.ps
diff --git a/doc/mkdocs b/doc/mkdocs
deleted file mode 100755
index 15ddc74b..00000000
--- a/doc/mkdocs
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-./sgml2html bird.sgml
-./sgml2latex bird.sgml
-./sgml2txt bird.sgml
-#> bird.txt
-#for i in bird.html bird-*.html; do 
-#    lynx -dump $i | grep -v 'file://' | grep -v '^References$' >> bird.txt
-#    done
diff --git a/doc/printme b/doc/printme
deleted file mode 100644
index cc1b9399..00000000
--- a/doc/printme
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-./mkdocs; cat bird.txt | sed s/.//g | lpr
diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in
index 0c600ced..fe282808 100644
--- a/tools/Makefile-top.in
+++ b/tools/Makefile-top.in
@@ -3,7 +3,7 @@
 
 objdir=@objdir@
 
-all depend tags install:
+all depend tags install install-docs:
 	$(MAKE) -C $(objdir) $@
 
 docs userdocs progdocs:
@@ -14,6 +14,6 @@ clean:
 	find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
 
 distclean: clean
-	$(MAKE) -C doc clean
+	$(MAKE) -C doc distclean
 	rm -rf $(objdir)
 	rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile
diff --git a/tools/Makefile.in b/tools/Makefile.in
index fb078d7d..6f9cd2e0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -54,6 +54,10 @@ install: all
 		echo "Not overwriting old bird.conf" ;						\
 	fi
 
+install-docs:
+	$(INSTALL) -d $(docdir)
+	$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(docdir)/
+
 clean:
 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
 	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl .dep-stamp
diff --git a/tools/Rules.in b/tools/Rules.in
index 2d2a8275..0df0feeb 100644
--- a/tools/Rules.in
+++ b/tools/Rules.in
@@ -39,6 +39,7 @@ bindir=@bindir@
 sbindir=@sbindir@
 sysconfdir=@sysconfdir@
 localstatedir=@localstatedir@
+docdir=@prefix@/doc
 
 ifdef source