From 7fbe6a96eddb5591fd1d61302f8962d449a72f61 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 18 Nov 2014 23:32:50 +0100
Subject: [PATCH] Generate the manual html documentation in the proper build
 directory

	* doc/manuals/Makefile.am: Renamed doc/manuals/Makefile into this.
	(BUILDDIR): Make this variable point to $(builddir)/_build as
	opposed to just _build previously.
	(SOURCEDIR): New variable that points to the source dir as known
	by the autotools magic.
	(ALLSPHINXOPTS): Make the source dir refer to the new
	$(SOURCEDIR), rather than just '.' as previously.
	* configure.ac (doc/manuals/Makefile): Generate this now.
	* doc/Makefile.am: Link the sub-directory doc/manuals.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 configure.ac                          | 13 +++++++------
 doc/Makefile.am                       |  1 +
 doc/manuals/{Makefile => Makefile.am} |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename doc/manuals/{Makefile => Makefile.am} (98%)

diff --git a/configure.ac b/configure.ac
index 9a85d0f1..81b629ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,12 +144,13 @@ fi
 
 AC_CONFIG_FILES([Makefile
 libabigail.pc
-include/Makefile
-include/abg-version.h
-doc/Makefile
-src/Makefile
-tools/Makefile
-tests/Makefile])
+  include/Makefile
+  include/abg-version.h
+  doc/Makefile
+    doc/manuals/Makefile
+  src/Makefile
+  tools/Makefile
+  tests/Makefile])
 
 AC_OUTPUT
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e977786c..516c8fb2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = manuals
 
 html: $(DO_HTML)
 install-html: $(DO_INSTALL_HTML)
diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile.am
similarity index 98%
rename from doc/manuals/Makefile
rename to doc/manuals/Makefile.am
index 8d04f319..c15a9c00 100644
--- a/doc/manuals/Makefile
+++ b/doc/manuals/Makefile.am
@@ -1,16 +1,16 @@
 # Makefile for Sphinx documentation
-#
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = $(builddir)/_build
+SOURCEDIR     = $(srcdir)
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .