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
This commit is contained in:
Micha Lenk
2011-06-06 21:02:49 +00:00
parent b3779bb878
commit f77309616d
5 changed files with 2 additions and 9 deletions

View File

@@ -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@

View File

@@ -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}'

View File

@@ -1,6 +1,5 @@
SUBDIRS = examples
docdir = ${GNC_DOC_INSTALL_DIR}
doc_DATA = \
README.francais \
README.german \

View File

@@ -1,6 +1,4 @@
docdir = ${GNC_DOC_INSTALL_DIR}/examples
doc_DATA = \
Money95bank_fr.qif \
Money95invst_fr.qif \

View File

@@ -32,8 +32,6 @@ EXTRA_DIST = \
python-bindings-doxygen.py
docdir = ${GNC_DOC_INSTALL_DIR}
all:
doc: doxygen.cfg