From f77309616d351e08d937b6c3b6cf2e6dddabfe9c Mon Sep 17 00:00:00 2001
From: Micha Lenk <micha@lenk.info>
Date: Mon, 6 Jun 2011 21:02:49 +0000
Subject: [PATCH] Don't ignore --docdir from ./configure for documentation
 destination dir

This was discussed in more detail here:
http://lists.gnucash.org/pipermail/gnucash-devel/2011-June/032066.html

This might change the default location where the documentation is installed to.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20736 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 Makefile.am              | 2 --
 configure.ac             | 4 ++--
 doc/Makefile.am          | 1 -
 doc/examples/Makefile.am | 2 --
 src/doc/Makefile.am      | 2 --
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 965873ecf3..a6deef3091 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
 
 SUBDIRS = . doc lib src intl-scm packaging po accounts checks
 
-docdir = ${GNC_DOC_INSTALL_DIR}
-
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
 
diff --git a/configure.ac b/configure.ac
index 8a0f5019ef..fcddedf303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script.
 #   Footer    - Autoconf footer stuff
 
 # Autoconf initialization
-AC_PREREQ(2.59)
+AC_PREREQ(2.60)
 AC_INIT([GnuCash], [2.4.99], [gnucash-devel@gnucash.org])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
@@ -549,7 +549,7 @@ AM_CONDITIONAL(CUSTOM_GNC_DBD_DIR, [test x"$GNC_DBD_DIR" != "x"])
 ### Variables
 ### Set up all the initial variable values...
 GNC_CONFIGDIR='${sysconfdir}/gnucash'
-GNC_DOC_INSTALL_DIR='${pkgdatadir}/doc'
+GNC_DOC_INSTALL_DIR='${docdir}'
 GNC_INCLUDE_DIR='${includedir}/gnucash'
 GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
 GNC_SHAREDIR='${pkgdatadir}'
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ad2f24c7cb..97db3fd68b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = examples
 
-docdir = ${GNC_DOC_INSTALL_DIR}
 doc_DATA = \
   README.francais \
   README.german \
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c2ba8759e1..952d95cc86 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,6 +1,4 @@
 
-docdir = ${GNC_DOC_INSTALL_DIR}/examples
-
 doc_DATA = \
   Money95bank_fr.qif  \
   Money95invst_fr.qif \
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
index 56673f9e94..eaa3bf6173 100644
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@@ -32,8 +32,6 @@ EXTRA_DIST = \
   python-bindings-doxygen.py
 
 
-docdir = ${GNC_DOC_INSTALL_DIR}
-
 all:
 
 doc: doxygen.cfg