Drop variables GNC_LIBDIR and GNC_MODULE_DIR.

Both are equal to pkglibdir and only used in src/bin/, even mixed with
pkglibdir. The module installation paths are hard-coded to pkglibdir
anyway, so we do not provide that flexibility right now.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15378 57a11ea4-9604-0410-9ed3-97b8803252fd

configure.in

@@ -537,7 +537,6 @@ AC_DEFINE(QOF_DISABLE_DEPRECATED,1, [Don't use deprecated qof functions])
 GNC_CONFIGDIR='${sysconfdir}/gnucash'
 GNC_DOC_INSTALL_DIR='${pkgdatadir}/doc'
 GNC_INCLUDE_DIR='${includedir}/gnucash'
-GNC_LIBDIR='${pkglibdir}'
 GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
 GNC_SHAREDIR='${pkgdatadir}'
 GNC_LIBEXECDIR='${libexecdir}/gnucash'
@@ -545,7 +544,6 @@ GNC_LIBEXECDIR='${libexecdir}/gnucash'
 GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
 GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
 GNC_UI_DIR='${GNC_SHAREDIR}/ui'
-GNC_MODULE_DIR='${pkglibdir}'
 GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps'
 
 AC_SUBST(GNC_ACCOUNTS_DIR)
@@ -554,8 +552,6 @@ AC_SUBST(GNC_DOC_INSTALL_DIR)
 AC_SUBST(GNC_GLADE_DIR)
 AC_SUBST(GNC_UI_DIR)
 AC_SUBST(GNC_INCLUDE_DIR)
-AC_SUBST(GNC_LIBDIR)
-AC_SUBST(GNC_MODULE_DIR)
 AC_SUBST(GNC_PIXMAP_DIR)
 AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_SHAREDIR)
@@ -1946,7 +1942,7 @@ AC_SUBST(LC_MESSAGES_ENUM)
 ### GnuCash flags and libs configuration
 
 GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgnc-module"
+GNUCASH_ENGINE_LIBS="-L${pkglibdir} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgnc-module"
 
 GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
 GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"

src/bin/Makefile.am

@@ -36,8 +36,7 @@ gnucash: gnucash.in ${top_builddir}/config.status Makefile
 	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
             -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
             -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
-	    -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g' \
-	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g'
+	    -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 
@@ -49,7 +48,6 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
 	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
             -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
             -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
-	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
 	    -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g"
 	mv $@.tmp $@
 	chmod u+x $@

src/bin/gnucash-valgrind.in

@@ -14,7 +14,7 @@ GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
 
 EXTRA_LIBS="${GNC_MODULE_PATH}"
 EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
 
 LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
 TOP_SRC_DIR="@-TOP_SRC_DIR-@"

src/bin/gnucash.in

@@ -14,7 +14,7 @@ GUILE_LOAD_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@${GUILE_LOAD_PATH}"
 
 EXTRA_LIBS="${GNC_MODULE_PATH}"
 EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
 
 LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
 DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"

src/bin/overrides/Makefile.am

@@ -35,7 +35,6 @@ gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
 	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
             -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
             -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
-	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
             -e 's#@-GNC_SCRIPT_OVERRIDE_DIR-@#${gncoverridedir}#g'
 	mv $@.tmp $@
 	chmod u+x $@

src/bin/overrides/gnucash-env.in

@@ -13,7 +13,7 @@ GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
 
 EXTRA_LIBS="${GNC_MODULE_PATH}"
 EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
 
 LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"