From cd5e3a13a6e0b6606d3a421f8cd44cdfb8314907 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 31 Aug 2015 19:16:41 +0100
Subject: [PATCH] [docs] Fix out-of-tree build

---
 docs/reference/Makefile.am               |  9 ++++++++-
 docs/reference/harfbuzz-docs.xml         | 12 ++++++------
 docs/{ => reference}/usermanual-ch01.xml |  0
 docs/{ => reference}/usermanual-ch02.xml |  0
 docs/{ => reference}/usermanual-ch03.xml |  0
 docs/{ => reference}/usermanual-ch04.xml |  0
 docs/{ => reference}/usermanual-ch05.xml |  0
 docs/{ => reference}/usermanual-ch06.xml |  0
 8 files changed, 14 insertions(+), 7 deletions(-)
 rename docs/{ => reference}/usermanual-ch01.xml (100%)
 rename docs/{ => reference}/usermanual-ch02.xml (100%)
 rename docs/{ => reference}/usermanual-ch03.xml (100%)
 rename docs/{ => reference}/usermanual-ch04.xml (100%)
 rename docs/{ => reference}/usermanual-ch05.xml (100%)
 rename docs/{ => reference}/usermanual-ch06.xml (100%)

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f7a4ad6a3..f605f24b4 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -69,7 +69,14 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= version.xml
+content_files=	\
+	usermanual-ch01.xml \
+	usermanual-ch02.xml \
+	usermanual-ch03.xml \
+	usermanual-ch04.xml \
+	usermanual-ch05.xml \
+	usermanual-ch06.xml \
+	version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
diff --git a/docs/reference/harfbuzz-docs.xml b/docs/reference/harfbuzz-docs.xml
index 788372a69..60ff8e28d 100644
--- a/docs/reference/harfbuzz-docs.xml
+++ b/docs/reference/harfbuzz-docs.xml
@@ -16,12 +16,12 @@
 
   <part>
     <title>User's manual</title>
-      <xi:include href="../usermanual-ch01.xml"/>
-      <xi:include href="../usermanual-ch02.xml"/>
-      <xi:include href="../usermanual-ch03.xml"/>
-      <xi:include href="../usermanual-ch04.xml"/>
-      <xi:include href="../usermanual-ch05.xml"/>
-      <xi:include href="../usermanual-ch06.xml"/>
+      <xi:include href="usermanual-ch01.xml"/>
+      <xi:include href="usermanual-ch02.xml"/>
+      <xi:include href="usermanual-ch03.xml"/>
+      <xi:include href="usermanual-ch04.xml"/>
+      <xi:include href="usermanual-ch05.xml"/>
+      <xi:include href="usermanual-ch06.xml"/>
   </part>
 
   <part>
diff --git a/docs/usermanual-ch01.xml b/docs/reference/usermanual-ch01.xml
similarity index 100%
rename from docs/usermanual-ch01.xml
rename to docs/reference/usermanual-ch01.xml
diff --git a/docs/usermanual-ch02.xml b/docs/reference/usermanual-ch02.xml
similarity index 100%
rename from docs/usermanual-ch02.xml
rename to docs/reference/usermanual-ch02.xml
diff --git a/docs/usermanual-ch03.xml b/docs/reference/usermanual-ch03.xml
similarity index 100%
rename from docs/usermanual-ch03.xml
rename to docs/reference/usermanual-ch03.xml
diff --git a/docs/usermanual-ch04.xml b/docs/reference/usermanual-ch04.xml
similarity index 100%
rename from docs/usermanual-ch04.xml
rename to docs/reference/usermanual-ch04.xml
diff --git a/docs/usermanual-ch05.xml b/docs/reference/usermanual-ch05.xml
similarity index 100%
rename from docs/usermanual-ch05.xml
rename to docs/reference/usermanual-ch05.xml
diff --git a/docs/usermanual-ch06.xml b/docs/reference/usermanual-ch06.xml
similarity index 100%
rename from docs/usermanual-ch06.xml
rename to docs/reference/usermanual-ch06.xml