* 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.
This commit is contained in:
Yaakov Selkowitz 2014-11-28 20:25:24 +00:00
parent 9d2eff6684
commit c2f50c4099
2 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2014-11-28 Yaakov Selkowitz <yselkowi@redhat.com>
* 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 <corinna@vinschen.de> 2014-11-24 Corinna Vinschen <corinna@vinschen.de>
* utils.xml (passwd): Align to latest changes. * utils.xml (passwd): Align to latest changes.

View File

@ -24,7 +24,6 @@ MKDIRP:=$(INSTALL) -m 755 -d
CC:=@CC@ CC:=@CC@
CC_FOR_TARGET:=@CC@ CC_FOR_TARGET:=@CC@
XSLTPROC:=xsltproc --xinclude
XMLTO:=xmlto --skip-validation --with-dblatex XMLTO:=xmlto --skip-validation --with-dblatex
include $(srcdir)/../Makefile.common 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 $< -$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl
@$(MKDIRP) cygwin-ug-net -$(XMLTO) pdf -o cygwin-ug-net/ $<
-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl
-$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $< -$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl
@$(MKDIRP) cygwin-api -$(XMLTO) pdf -o cygwin-api/ $<
-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
faq/faq.html : $(FAQ_SOURCES) faq/faq.html : $(FAQ_SOURCES)
-$(XMLTO) html -o faq -m $(srcdir)/cygwin.xsl $(srcdir)/faq.xml -$(XMLTO) html -o faq -m $(srcdir)/cygwin.xsl $(srcdir)/faq.xml
-sed -i 's;</a><a name="id[0-9]*"></a>;</a>;g' faq/faq.html -sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \ TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \
cygwin-ug-net.pdf cygwin-ug-net.xml \ cygwin-ug-net.pdf cygwin-ug-net.xml \