* 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: Ditto.
This commit is contained in:
		| @@ -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> | 2010-06-26  Ken Brown  <kbrown@cornell.edu> | ||||||
|  |  | ||||||
| 	* setup-net.sgml: Add a paragraph describing now to avoid unintentional | 	* setup-net.sgml: Add a paragraph describing now to avoid unintentional | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ CC:=@CC@ | |||||||
| CC_FOR_TARGET:=@CC@ | CC_FOR_TARGET:=@CC@ | ||||||
| exeext:=@build_exeext@ | exeext:=@build_exeext@ | ||||||
|  |  | ||||||
| XMLTO:=xmlto --skip-validation | XMLTO:=xmlto --skip-validation --with-dblatex | ||||||
|  |  | ||||||
| include $(srcdir)/../Makefile.common | 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 | # Some versions of jw hang with the -o option | ||||||
| cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.sgml | 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 | cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile | ||||||
| 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $< | 	-./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 $< | 	-${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.dsl $< | ||||||
|  |  | ||||||
| cygwin-api/cygwin-api.pdf : cygwin-api.sgml | 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 | cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile | ||||||
| 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $< | 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $< | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ bash | |||||||
| bzip2 | bzip2 | ||||||
| coreutils | coreutils | ||||||
| cygwin | cygwin | ||||||
| docbook-utils | dblatex | ||||||
| docbook-xml42 | docbook-xml45 | ||||||
| docbook-xsl | docbook-xsl | ||||||
| gzip | gzip | ||||||
| make | make | ||||||
|   | |||||||
| @@ -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  | <literal>perl</literal>, and <literal>cocom</literal>. If you want to run  | ||||||
| the tests, <literal>dejagnu</literal> is also required. | the tests, <literal>dejagnu</literal> is also required. | ||||||
| Normally, building ignores any errors in building the documentation, | 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 | <literal>xmlto</literal> packages.  For more information on building the | ||||||
| documentation, see the README included in the <literal>cygwin-doc</literal> package. | documentation, see the README included in the <literal>cygwin-doc</literal> package. | ||||||
| </para> | </para> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user