Changes to create docs.

.gitignore

@@ -1,7 +1,7 @@
 # Don't need the OS's leftovers.
 **/.DS_Store
 
-# Targets build by the configure phase
+# Targets built by the configure phase
 /Makefile
 /autom4te.cache
 /config.h
@@ -12,14 +12,27 @@
 # Tool(s) built to facilitate the building of the product
 /doc/mantohtml
 
-# Actual targets build for distribution
+# Actual targets built for distribution
 /epm
 /epm.list
 /epminstall
 /mkepmlist
 /setup
 /uninst
 
+# more targets built for distribution
+doc/epm-book.epub
+doc/epm-book.html
+doc/epm-book.pdf
+
+# manpage targets built for distribution
+doc/epm.1.html
+doc/epminstall.1.html
+doc/mkepmlist.1.html
+doc/setup.1.html
+doc/epm.list.5.html
+doc/setup.types.5.html
+
 # Flotsam left by the make process
 *.o
 *.a

Makefile.in

@@ -86,6 +86,7 @@ TARGETS		=	libepm.a \
 			epminstall \
 			mkepmlist \
 			@GUIS@
+
 EPM_OBJS	=	bsd.o \
 			deb.o \
 			dist.o \
@@ -99,12 +100,15 @@ EPM_OBJS	=	bsd.o \
 			string.o \
 			support.o \
 			tar.o
+
 SETUP_OBJS	=	setup.o \
 			setup2.o \
 			gui-common.o
+
 UNINST_OBJS	=	uninst.o \
 			uninst2.o \
 			gui-common.o
+
 OBJS		=	epm.o \
 			$(EPM_OBJS) \
 			epminstall.o \
@@ -114,23 +118,25 @@ OBJS		=	epm.o \
 
 
 # Make all targets...
-all:	$(TARGETS) Makefile config.h
+all:	$(TARGETS) Makefile config.h docs
 
+docs:
+	( cd doc ; make )
 
 # Clean all generated files...
 clean:
 	$(RM) $(OBJS)
 	$(RM) $(TARGETS)
-
+	( cd doc ; make clean )
 
 # Clean all generated and configuration files...
 distclean:
 	$(RM) $(OBJS)
 	$(RM) $(TARGETS)
 	$(RM) config.cache config.h config.log config.status
-	$(RM) Makefile doc/Makefile
 	$(RM) epm.list
-
+	( cd doc ; make distclean )
+	$(RM) Makefile 
 
 # Install all targets...
 install: all @INSTALL_GUIS@ @INSTALL_OSX@

doc/Makefile.in

@@ -57,13 +57,17 @@ VPATH		=	$(srcdir)
 
 # Man page generation rule...
 .SUFFIXES:	.html .1 .5
-.1.html .5.html:
-	$(RM) $@
-	./mantohtml $< >$@
+%.1.html: %.1
+	./mantohtml $< $@
+
+%.5.html: %.5
+	./mantohtml $< $@
 
 
 # Targets...
-MANPAGES	=	epm.html epminstall.html mkepmlist.html setup.html
+MANPAGES	=	epm.1.html epminstall.1.html mkepmlist.1.html setup.1.html \
+			epm.list.5.html setup.types.5.html
+
 HTMLFILES	=	title.html preface.html 1-intro.html 2-building.html \
 			3-packaging.html 4-advanced.html 5-examples.html \
 			a-license.html b-manpages.html c-reference.html \
@@ -74,12 +78,16 @@ BOOKS		=	epm-book.epub epm-book.html epm-book.pdf
 # Make everything (requires HTMLDOC)
 all:	$(MANPAGES) $(BOOKS)
 
+# Clean it like you mean it
+distclean: clean
+	$(RM) Makefile
+
 # Clean generated programs
 clean:
-	$(RM) mantohtml mantohtml.o
+	$(RM) mantohtml mantohtml.o $(MANPAGES) $(BOOKS)
 
 # Install documentation
-install:
+install: all
 	echo Installing EPM manpages in $(BUILDROOT)$(mandir)/man1
 	$(INSTALL) -d -m 755 $(BUILDROOT)$(mandir)/man1
 	for file in epm.1 epminstall.1 mkepmlist. setup.1; do \

doc/b-manpages.html

@@ -4,16 +4,22 @@
 <H1><A NAME="MANPAGES">B - Command Reference</A></H1>
 
 <!-- NEW PAGE -->
-<EMBED SRC="epm.html">
+<EMBED SRC="epm.1.html">
 
 <!-- NEW PAGE -->
-<EMBED SRC="epminstall.html">
+<EMBED SRC="epminstall.1.html">
 
 <!-- NEW PAGE -->
-<EMBED SRC="mkepmlist.html">
+<EMBED SRC="mkepmlist.1.html">
 
 <!-- NEW PAGE -->
-<EMBED SRC="setup.html">
+<EMBED SRC="setup.1.html">
+
+<!-- NEW PAGE -->
+<EMBED SRC="epm.list.5.html">
+
+<!-- NEW PAGE -->
+<EMBED SRC="setup.types.5.html">
 
 </BODY>
 </HTML>

doc/epm-book.book

@@ -1,5 +1,5 @@
 #HTMLDOC 1.9
--t pdf14 -f "epm-book.pdf" --book --toclevels 2 --no-numbered --toctitle "Table of Contents" --title --titleimage "title.html" --linkstyle plain --size 6x9in --left 1in --right 0.750in --top 0.750in --bottom 0.750in --header .t. --header1 ... --footer h.1 --nup 1 --tocheader .t. --tocfooter ..i --duplex --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=90 --fontsize 10.0 --fontspacing 1.2 --headingfont Sans --bodyfont Sans --headfootsize 9.0 --headfootfont Sans-Oblique --charset iso-8859-1 --links --embedfonts --pagemode document --pagelayout tworight --firstpage p1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 680 --strict --no-overflow
+-t pdf14 -f "epm-book.pdf" --book --toclevels 2 --no-numbered --toctitle "Table of Contents" --title --titleimage "title.html" --linkstyle plain --size 8.5x11in --left 1in --right 0.750in --top 0.750in --bottom 0.750in --header .t. --header1 ... --footer h.1 --nup 1 --tocheader .t. --tocfooter ..i --duplex --portrait --color --no-pscommands --no-xrxcomments --compression=9 --jpeg=90 --fontsize 10.0 --fontspacing 1.2 --headingfont Sans --bodyfont Sans --headfootsize 9.0 --headfootfont Sans-Oblique --charset iso-8859-1 --links --embedfonts --pagemode document --pagelayout tworight --firstpage p1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 680 --strict --no-overflow
 preface.html
 1-intro.html
 2-building.html