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.

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index acd6b0a8ff24651ef42214656b4ef5292741ea20..98000d034e6fd6594acfa7beb659b9736dc01846 100644 (file)
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-06  Warren Young  <warren@etr-usa.com>
+
+       * cygwin-api.in.xml (bookinfo): Reverted XInclude for legal.xml
+       fragment to a DOCTOOL include.
+
+
 2013-05-03  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
        * Makefile (FAQ_SOURCES): Use wildcard function to find sources in
@@ -6,7 +12,7 @@
 2013-05-01  Warren Young  <warren@etr-usa.com>
 
        * 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  <warren@etr-usa.com>

diff --git a/winsup/doc/cygwin-api.in.xml b/winsup/doc/cygwin-api.in.xml
index 726798ef29316bbd32dd9f42fa9767671f0e3df1..3fee468dc81c07f4a3525837ed677ee4660e4ac5 100644 (file)
--- a/winsup/doc/cygwin-api.in.xml
+++ b/winsup/doc/cygwin-api.in.xml
@@ -7,7 +7,7 @@
   <bookinfo>
     <date>1998-08-31</date>
     <title>Cygwin API Reference</title>
-               <xi:include href="legal.xml"/>
+DOCTOOL-INSERT-legal
   </bookinfo>
 
   <toc></toc>