diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/doc/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/doc/Makefile.in | 6 | ||||
| -rw-r--r-- | winsup/doc/README | 4 | ||||
| -rw-r--r-- | winsup/doc/faq-programming.xml | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 887640b62..ca4b196a8 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,11 @@ +2010-06-27 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + + * Makefile.in: Use "xmlto pdf" instead of docbook2pdf. + Force the dblatex backend, as the default passivetex does not work. + * README: Replace docbook-utils dependency with dblatex. + Update required docbook-xml version. + * faq-programming.xml (building-cygwin): Ditto. + 2010-06-26 Ken Brown <kbrown@cornell.edu> * setup-net.sgml: Add a paragraph describing now to avoid unintentional diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in index 75f3e3b78..5ea8fd529 100644 --- a/winsup/doc/Makefile.in +++ b/winsup/doc/Makefile.in @@ -17,7 +17,7 @@ CC:=@CC@ CC_FOR_TARGET:=@CC@ exeext:=@build_exeext@ -XMLTO:=xmlto --skip-validation +XMLTO:=xmlto --skip-validation --with-dblatex include $(srcdir)/../Makefile.common @@ -56,7 +56,7 @@ cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.sgml doctool # Some versions of jw hang with the -o option cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.sgml - -cd cygwin-ug-net && docbook2pdf ../$< + -${XMLTO} pdf -o cygwin-ug-net/ $< cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile -./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $< @@ -65,7 +65,7 @@ cygwin-api/cygwin-api.html : cygwin-api.sgml -${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.dsl $< cygwin-api/cygwin-api.pdf : cygwin-api.sgml - -cd cygwin-api && docbook2pdf ../$< + -${XMLTO} pdf -o cygwin-api/ $< cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile -./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $< diff --git a/winsup/doc/README b/winsup/doc/README index b0f20002d..58fd88721 100644 --- a/winsup/doc/README +++ b/winsup/doc/README @@ -7,8 +7,8 @@ bash bzip2 coreutils cygwin -docbook-utils -docbook-xml42 +dblatex +docbook-xml45 docbook-xsl gzip make diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml index 2d4284ae4..3936dbc51 100644 --- a/winsup/doc/faq-programming.xml +++ b/winsup/doc/faq-programming.xml @@ -420,7 +420,7 @@ installed; you at least need <literal>gcc</literal>, <literal>make</literal>, <literal>perl</literal>, and <literal>cocom</literal>. If you want to run the tests, <literal>dejagnu</literal> is also required. Normally, building ignores any errors in building the documentation, -which requires the <literal>docbook-utils</literal>, <literal>docbook-xml42</literal>, <literal>docbook-xsl</literal>, and +which requires the <literal>dblatex</literal>, <literal>docbook-xml45</literal>, <literal>docbook-xsl</literal>, and <literal>xmlto</literal> packages. For more information on building the documentation, see the README included in the <literal>cygwin-doc</literal> package. </para> |