===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.231
retrieving revision 1.240
diff -u -p -r1.231 -r1.240
--- mandoc/Makefile	2009/10/20 18:20:59	1.231
+++ mandoc/Makefile	2009/10/31 06:38:08	1.240
@@ -9,16 +9,17 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.9
-VDATE	   = 21 October 2009
+VERSION	   = 1.9.12
+VDATE	   = 31 October 2009
 
-VFLAGS     = -DVERSION=\"$(VERSION)\"
+VFLAGS     = -DVERSION="\"$(VERSION)\""
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -g
 CFLAGS    += $(VFLAGS)
+#CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
 LINTFLAGS += $(VFLAGS)
 
 MANDOCFLAGS = -Wall -fstrict
-MANDOCHTML = -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+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 \
@@ -57,7 +58,7 @@ HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
 	     libmandoc.h html.h chars.h out.h main.h
 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)
+SGMLS	   = index.sgml
 XSLS	   = ChangeLog.xsl
 HTMLS	   = index.html mandoc.1.html mdoc.3.html ChangeLog.html \
 	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
@@ -87,6 +88,9 @@ clean:
 cleanlint:
 	rm -f $(LNS) $(LLNS)
 
+cleanhtml:
+	rm -f $(HTML) $(GSGMLS)
+
 dist:	mdocml-$(VERSION).tar.gz
 
 www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
@@ -231,7 +235,7 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
 
 .sgml.html:
-	validate $<
+	validate --warn $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt .3.3.txt .7.7.txt: