From c2f50c4099b5b3db7dca5797bde8c5886d999c36 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 28 Nov 2014 20:25:24 +0000 Subject: [PATCH] * Makefile.in (XSLTPROC): Remove. (cygwin-ug-net/cygwin-ug-net.pdf): Build with xmlto pdf. (cygwin-api/cygwin-api.pdf): Ditto. (faq/faq.html): Fix extraneous anchor removal. --- winsup/doc/ChangeLog | 7 +++++++ winsup/doc/Makefile.in | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 96986f31b..b49e30cc6 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,10 @@ +2014-11-28 Yaakov Selkowitz + + * Makefile.in (XSLTPROC): Remove. + (cygwin-ug-net/cygwin-ug-net.pdf): Build with xmlto pdf. + (cygwin-api/cygwin-api.pdf): Ditto. + (faq/faq.html): Fix extraneous anchor removal. + 2014-11-24 Corinna Vinschen * utils.xml (passwd): Align to latest changes. diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in index 21fd5ad30..b7a8dbd8d 100644 --- a/winsup/doc/Makefile.in +++ b/winsup/doc/Makefile.in @@ -24,7 +24,6 @@ MKDIRP:=$(INSTALL) -m 755 -d CC:=@CC@ CC_FOR_TARGET:=@CC@ -XSLTPROC:=xsltproc --xinclude XMLTO:=xmlto --skip-validation --with-dblatex include $(srcdir)/../Makefile.common @@ -80,19 +79,17 @@ cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.xml cygwin.xsl -$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $< cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl - @$(MKDIRP) cygwin-ug-net - -$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@ + -$(XMLTO) pdf -o cygwin-ug-net/ $< cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl -$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $< cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl - @$(MKDIRP) cygwin-api - -$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@ + -$(XMLTO) pdf -o cygwin-api/ $< faq/faq.html : $(FAQ_SOURCES) -$(XMLTO) html -o faq -m $(srcdir)/cygwin.xsl $(srcdir)/faq.xml - -sed -i 's;;;g' faq/faq.html + -sed -i 's;;;g' faq/faq.html TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \ cygwin-ug-net.pdf cygwin-ug-net.xml \ -- 2.43.5