From 170c43cf3f18516849bb89703b1ad97444a20f27 Mon Sep 17 00:00:00 2001 From: Warren Young Date: Mon, 6 May 2013 21:20:41 +0000 Subject: [PATCH] Reverted XInclude in cygwin-api.in.xml from an XInclude to a DOCTOOL include. You can't mix the two fragment inclusion mechanisms within a single document because of the way it interacts with autoconf "build in separate tree" mechanism. Either work separately, but they fail when you try to use them together due to the way doctool chooses output directories for its generated files. --- winsup/doc/ChangeLog | 8 +++++++- winsup/doc/cygwin-api.in.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index acd6b0a8f..98000d034 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,9 @@ +2013-05-06 Warren Young + + * cygwin-api.in.xml (bookinfo): Reverted XInclude for legal.xml + fragment to a DOCTOOL include. + + 2013-05-03 Christopher Faylor * Makefile (FAQ_SOURCES): Use wildcard function to find sources in @@ -6,7 +12,7 @@ 2013-05-01 Warren Young * bodysnatcher.pl: Created - * Makefile.in (faq/faq.body): Added target to create this file from + * Mak6file.in (faq/faq.body): Added target to create this file from faq/faq.html using new bodysnatcher.pl script. 2013-05-01 Warren Young diff --git a/winsup/doc/cygwin-api.in.xml b/winsup/doc/cygwin-api.in.xml index 726798ef2..3fee468dc 100644 --- a/winsup/doc/cygwin-api.in.xml +++ b/winsup/doc/cygwin-api.in.xml @@ -7,7 +7,7 @@ 1998-08-31 Cygwin API Reference - +DOCTOOL-INSERT-legal -- 2.43.5