===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.217
retrieving revision 1.221
diff -u -p -r1.217 -r1.221
--- mandoc/Makefile	2009/09/21 16:05:05	1.217
+++ mandoc/Makefile	2009/09/25 14:07:51	1.221
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.html .3.html .7.html
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -9,8 +9,8 @@ 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
@@ -52,11 +52,15 @@ DATAS	   = arch.in att.in lib.in msec.in st.in \
 	     vol.in chars.in
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
 	     libmandoc.h html.h chars.h
-SGMLS	   = index.sgml 
+GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
+	     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.txt ChangeLog.txt
 EXAMPLES   = example.style.css
 XMLS	   = ChangeLog.xml
 STATICS	   = index.css style.css external.png
@@ -66,7 +70,7 @@ MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char
 	     man.7 man.3
 BINS	   = mandoc
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	     $(TARGZS) tags $(MD5S) $(XMLS) 
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
 INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
 	     $(DATAS) $(XSLS) $(EXAMPLES)
 
@@ -82,10 +86,10 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-www:	all $(HTMLS) $(MD5S) $(TARGZS)
+www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
 installwww: www
-	install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+	install -m 0444 $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
@@ -190,6 +194,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
 
@@ -224,19 +231,19 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .1.1.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
-.1.1.html:
+.1.1.sgml:
 	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
 
 .3.3.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
-.3.3.html:
+.3.3.sgml:
 	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
 
 .7.7.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
-.7.7.html:
+.7.7.sgml:
 	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
 
 .tar.gz.md5: