r20736 - gnucash/trunk - Don't ignore --docdir from ./configure for documentation destination dir

[Micha Lenk]

Author: micha
Date: 2011-06-06 17:02:49 -0400 (Mon, 06 Jun 2011)
New Revision: 20736
Trac: http://svn.gnucash.org/trac/changeset/20736

Modified:
   gnucash/trunk/Makefile.am
   gnucash/trunk/configure.ac
   gnucash/trunk/doc/Makefile.am
   gnucash/trunk/doc/examples/Makefile.am
   gnucash/trunk/src/doc/Makefile.am
Log:
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.

Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am	2011-06-04 03:37:38 UTC (rev 20735)
+++ gnucash/trunk/Makefile.am	2011-06-06 21:02:49 UTC (rev 20736)
@@ -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@
 

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-06-04 03:37:38 UTC (rev 20735)
+++ gnucash/trunk/configure.ac	2011-06-06 21:02:49 UTC (rev 20736)
@@ -19,7 +19,7 @@
 #   Footer    - Autoconf footer stuff
 
 # Autoconf initialization
-AC_PREREQ(2.59)
+AC_PREREQ(2.60)
 AC_INIT([GnuCash], [2.4.99], [gnucash-devel at gnucash.org])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
@@ -549,7 +549,7 @@
 ### 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}'

Modified: gnucash/trunk/doc/Makefile.am
===================================================================
--- gnucash/trunk/doc/Makefile.am	2011-06-04 03:37:38 UTC (rev 20735)
+++ gnucash/trunk/doc/Makefile.am	2011-06-06 21:02:49 UTC (rev 20736)
@@ -1,6 +1,5 @@
 SUBDIRS = examples
 
-docdir = ${GNC_DOC_INSTALL_DIR}
 doc_DATA = \
   README.francais \
   README.german \

Modified: gnucash/trunk/doc/examples/Makefile.am
===================================================================
--- gnucash/trunk/doc/examples/Makefile.am	2011-06-04 03:37:38 UTC (rev 20735)
+++ gnucash/trunk/doc/examples/Makefile.am	2011-06-06 21:02:49 UTC (rev 20736)
@@ -1,6 +1,4 @@
 
-docdir = ${GNC_DOC_INSTALL_DIR}/examples
-
 doc_DATA = \
   Money95bank_fr.qif  \
   Money95invst_fr.qif \

Modified: gnucash/trunk/src/doc/Makefile.am
===================================================================
--- gnucash/trunk/src/doc/Makefile.am	2011-06-04 03:37:38 UTC (rev 20735)
+++ gnucash/trunk/src/doc/Makefile.am	2011-06-06 21:02:49 UTC (rev 20736)
@@ -32,8 +32,6 @@
   python-bindings-doxygen.py
 
 
-docdir = ${GNC_DOC_INSTALL_DIR}
-
 all:
 
 doc: doxygen.cfg