summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2009-07-20 15:08:08 +0000
committerCorinna Vinschen <corinna@vinschen.de>2009-07-20 15:08:08 +0000
commitcb8ee36ae8a617fc6fddc36d4c2e76e7593d2765 (patch)
tree8c6a423717eae00cd10a0fd072b9d13c9203eceb
parent637a1aec8fba084c65b0afea3b49959917aaa253 (diff)
downloadcygnal-cb8ee36ae8a617fc6fddc36d4c2e76e7593d2765.tar.gz
cygnal-cb8ee36ae8a617fc6fddc36d4c2e76e7593d2765.tar.bz2
cygnal-cb8ee36ae8a617fc6fddc36d4c2e76e7593d2765.zip
* Makefile.in (all): Fix wrong target names.
(cygwin-ug-net/cygwin-ug-net-nochunks.html.gz): Ditto. (cygwin-ug-net/cygwin-ug-net.pdf): Convert to use docbook2pdf. (cygwin-api/cygwin-api.pdf): Ditto.
-rw-r--r--winsup/doc/ChangeLog7
-rw-r--r--winsup/doc/Makefile.in13
2 files changed, 14 insertions, 6 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 553fb2bd6..a38216d69 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,5 +1,12 @@
2009-07-20 Corinna Vinschen <corinna@vinschen.de>
+ * Makefile.in (all): Fix wrong target names.
+ (cygwin-ug-net/cygwin-ug-net-nochunks.html.gz): Ditto.
+ (cygwin-ug-net/cygwin-ug-net.pdf): Convert to use docbook2pdf.
+ (cygwin-api/cygwin-api.pdf): Ditto.
+
+2009-07-20 Corinna Vinschen <corinna@vinschen.de>
+
* faq: Throughout, revert references to User's Guide to default URL.
2009-07-20 Corinna Vinschen <corinna@vinschen.de>
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 484452541..774628ac4 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -32,18 +32,18 @@ FAQ_SOURCES:= faq-api.xml faq-programming.xml faq-resources.xml \
all : \
cygwin-ug-net/cygwin-ug-net.html \
- cygwin-ug-net/cygwin-ug-net.html.gz \
+ cygwin-ug-net/cygwin-ug-net-nochunks.html.gz \
cygwin-api/cygwin-api.html \
faq/faq.html faq/faq-nochunks.html \
cygwin-ug-net/cygwin-ug-net.pdf \
- cygwin-api/cygwin-api.html
+ cygwin-api/cygwin-api.pdf
clean:
rm -Rf $(TOCLEAN)
install: all
-cygwin-ug-net/cygwin-ug-net.html.gz : cygwin-ug-net.sgml doctool
+cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : cygwin-ug-net.sgml doctool
-xmlto html-nochunks -m $(srcdir)/cygwin.dsl $<
-cp cygwin-ug-net.html cygwin-ug-net/cygwin-ug-net-nochunks.html
-rm -f cygwin-ug-net/cygwin-ug-net-nochunks.html.gz
@@ -52,8 +52,9 @@ cygwin-ug-net/cygwin-ug-net.html.gz : cygwin-ug-net.sgml doctool
cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.sgml doctool
-xmlto html -o cygwin-ug-net/ -m $(srcdir)/cygwin.dsl $<
-cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.sgml doctool
- -xmlto --extension -v pdf -o cygwin-ug-net/ -m $(srcdir)/cygwin.dsl $<
+# 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 ../$<
cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile
-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
@@ -62,7 +63,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
- -xmlto --extension -v pdf -o cygwin-api/ -m $(srcdir)/cygwin.dsl $<
+ -cd cygwin-api && docbook2pdf ../$<
cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile
-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<