===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.219
retrieving revision 1.222
diff -u -p -r1.219 -r1.222
--- mandoc/Makefile	2009/09/24 09:20:02	1.219
+++ mandoc/Makefile	2009/10/03 16:36:06	1.222
@@ -9,14 +9,17 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.5
-VDATE	   = 21 September 2009
+VERSION	   = 1.9.6
+VDATE	   = 25 September 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 CFLAGS    += $(VFLAGS)
 LINTFLAGS += $(VFLAGS)
 
+MANDOCFLAGS	= -Wall -fstrict
+MANDOCHTML	= -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+
 MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
 	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
 	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
@@ -56,11 +59,11 @@ GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manu
 	     mandoc_char.7.sgml man.7.sgml man.3.sgml
 SGMLS	   = index.sgml $(GSGMLS)
 XSLS	   = ChangeLog.xsl
-HTMLS	   = index.html ChangeLog.html mandoc.1.html mdoc.3.html \
+HTMLS	   = index.html mandoc.1.html mdoc.3.html \
 	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
 	     manuals.7.html
 TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
-	     mandoc_char.7.txt manuals.7.html
+	     mandoc_char.7.txt manuals.7.txt ChangeLog.txt
 EXAMPLES   = example.style.css
 XMLS	   = ChangeLog.xml
 STATICS	   = index.css style.css external.png
@@ -194,6 +197,9 @@ libmdoc.h: mdoc.h
 ChangeLog.xml:
 	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
+ChangeLog.txt:
+	cvs2cl -t -f $@
+
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
 	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
@@ -226,22 +232,22 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .1.1.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .3.3.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .3.3.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .7.7.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .7.7.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .tar.gz.md5:
 	md5 $< > $@