Permalink
Browse files

Fix up doc makefile and make the docbook xml validate

darcs-hash:20090228130236-adfee-431c2cff423cbc66f14984eab7f50084accbc79d
  • Loading branch information...
dcoutts committed Feb 28, 2009
1 parent 144dc8a commit 213e1406750bcdeb99332f524ce994ef360fc46e
Showing with 13 additions and 8 deletions.
  1. +12 −7 doc/Makefile
  2. 0 doc/{fptools.css → c2hs.css}
  3. +1 −1 doc/c2hs.xml
View
@@ -25,24 +25,29 @@
#
default: html
+XMLLINT=xmllint
+XMLLINT_OPTIONS=--nonet --noout --valid
+
XSLTPROC=xsltproc
XSLTPROC_HTML_OUTDIR=users_guide/
-XSLTPROC_HTML_CSS=fptools.css
+XSLTPROC_HTML_CSS=c2hs.css
XSLTPROC_HTML_PARAMS=\
- --stringparam use.id.as.filename 1 \
+ --param use.id.as.filename 1 \
--stringparam base.dir $(XSLTPROC_HTML_OUTDIR) \
--stringparam html.stylesheet $(XSLTPROC_HTML_CSS)
-XSLTPROC_HTML_STYLESHEET=/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/chunk.xsl
+XSLTPROC_HTML_STYLESHEET=http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
+XSLTPROC_OPTIONS=--nonet $(XSLTPROC_HTML_PARAMS) $(XSLTPROC_HTML_STYLESHEET)
# build targets
#
.PHONY: html pdf
-html:
- $(XSLTPROC) $(XSLTPROC_HTML_PARAMS) $(XSLTPROC_HTML_STYLESHEET) c2hs.xml
+html: c2hs.xml
+ $(XMLLINT) $(XMLLINT_OPTIONS) $<
+ $(XSLTPROC) $(XSLTPROC_OPTIONS) $<
cp $(XSLTPROC_HTML_CSS) $(XSLTPROC_HTML_OUTDIR)
-pdf:
- sgml2pdf c2hs.xml
+pdf: c2hs.xml
+ sgml2pdf $<
# auxiliary targets
#
File renamed without changes.
View
@@ -1037,7 +1037,7 @@ ptrkind -> [`foreign' | `stable'] ['newtype' | '->' ident]
<title>Bug Reports and Suggestions</title>
<para>
There is a tracker for bugs and feature requests:
- <ulink ulr="http://hackage.haskell.org/trac/c2hs/" />.
+ <ulink url="http://hackage.haskell.org/trac/c2hs/" />.
Alternatively if you prefer email please send your bug reports and
suggestions to the C->Haskell List <email>c2hs@haskell.org</email>.
</para>

0 comments on commit 213e140

Please sign in to comment.