From c98535c160f1b60686f5efee07541d9c19283894 Mon Sep 17 00:00:00 2001
From: Phil Longstaff <plongstaff@newearth.org>
Date: Sun, 21 Jun 2009 17:41:29 +0000
Subject: [PATCH] Separate environment variable setup into common file

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18149 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/bin/Makefile.am          | 46 ++++++++++++++++++++----------------
 src/bin/gnucash-gdb.in       | 26 +-------------------
 src/bin/gnucash-setup-env.in | 29 +++++++++++++++++++++++
 src/bin/gnucash-valgrind.in  | 26 +-------------------
 src/bin/gnucash.in           | 26 +-------------------
 5 files changed, 58 insertions(+), 95 deletions(-)
 create mode 100644 src/bin/gnucash-setup-env.in

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c3bf5fbe3d..7d3186477d 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -32,34 +32,29 @@ gnucash_bin_LDADD = \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
   ${top_builddir}/src/gnc-module/libgnc-module.la
 
-gnucash: gnucash.in ${top_builddir}/config.status Makefile
+gnucash: gnucash.in gnucash-setup-env ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's#@-BIN_DIR-@#${bindir}#g' \
-		-e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
-	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
-	    -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#@-BIN_DIR-@#${bindir}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 
-gnucash-gdb: gnucash-gdb.in ${top_builddir}/config.status Makefile
+gnucash-gdb: gnucash-gdb.in gnucash-setup-env ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's#@-BIN_DIR-@#${bindir}#g' \
-		-e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
-	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
-	    -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#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g" \
-	    -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g'
+	    -e 's#@-BIN_DIR-@#${bindir}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 
 gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
+	rm -f $@.tmp
+	sed < $< > $@.tmp \
+	    -e 's#@-BIN_DIR-@#${bindir}#g' \
+	    -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g"
+	mv $@.tmp $@
+	chmod u+x $@
+
+gnucash-setup-env: gnucash-setup-env.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's#@-BIN_DIR-@#${bindir}#g' \
@@ -92,13 +87,24 @@ CLEANFILES = $(BUILT_SOURCES) gnucash gnucash-valgrind gnucash-gdb
 # by these top-level "common" scripts.
 gnc_common_scripts = gnucash-env gnucash-make-guids
 
-bin_SCRIPTS = ${gnc_common_scripts} update-gnucash-gconf gnucash gnucash-valgrind gnucash-gdb
+bin_SCRIPTS = \
+    ${gnc_common_scripts} \
+	update-gnucash-gconf \
+	gnucash \
+	gnucash-valgrind \
+	gnucash-gdb \
+	gnucash-setup-env
 
 # if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
 gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
 
-EXTRA_DIST = generate-gnc-script update-gnucash-gconf.in \
-	gnucash.in gnucash-valgrind.in gnucash-gdb.in
+EXTRA_DIST = \
+    generate-gnc-script \
+	update-gnucash-gconf.in \
+	gnucash.in \
+	gnucash-valgrind.in \
+	gnucash-gdb.in \
+	gnucash-setup-env.in
 
 ## Gnucash scripts -- real code is in overrides, these just get you there.
 ${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
diff --git a/src/bin/gnucash-gdb.in b/src/bin/gnucash-gdb.in
index 03cb4422f1..2575aa5e04 100644
--- a/src/bin/gnucash-gdb.in
+++ b/src/bin/gnucash-gdb.in
@@ -1,29 +1,5 @@
 #!/bin/sh
 
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
-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_PKGLIB_INSTALLDIR-@"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
-GNC_DBD_DIR="@-GNC_DBD_DIR-@"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DBD_DIR
+. @-BIN_DIR-@/gnucash-setup-env
 
 exec gdb gnucash-bin "$@"
diff --git a/src/bin/gnucash-setup-env.in b/src/bin/gnucash-setup-env.in
new file mode 100644
index 0000000000..a7896b3c4e
--- /dev/null
+++ b/src/bin/gnucash-setup-env.in
@@ -0,0 +1,29 @@
+# gnucash-setup-env
+#
+# Common environment setup used by different gnucash startup scripts
+
+PATH="@-BIN_DIR-@:${PATH}"
+export PATH
+
+GUILE_WARN_DEPRECATED="no"
+export GUILE_WARN_DEPRECATED
+
+GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
+
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
+EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
+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_PKGLIB_INSTALLDIR-@"
+
+LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
+GNC_DBD_DIR="@-GNC_DBD_DIR-@"
+
+export GNC_MODULE_PATH
+export GUILE_LOAD_PATH
+export LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+export GNC_DBD_DIR
diff --git a/src/bin/gnucash-valgrind.in b/src/bin/gnucash-valgrind.in
index 91d30c07f1..e24327ff37 100644
--- a/src/bin/gnucash-valgrind.in
+++ b/src/bin/gnucash-valgrind.in
@@ -1,32 +1,8 @@
 #!/bin/sh
 
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
+. @-BIN_DIR-@/gnucash-setup-env
 
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
-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_PKGLIB_INSTALLDIR-@"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
 TOP_SRC_DIR="@-TOP_SRC_DIR-@"
-GNC_DBD_DIR="@-GNC_DBD_DIR-@"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DBD_DIR
-
 #
 # Other potentially useful options, particularly for valgrind-2.x:
 # --tool=memcheck --trace-children=yes
diff --git a/src/bin/gnucash.in b/src/bin/gnucash.in
index 08ca5ff242..0c44988ffe 100644
--- a/src/bin/gnucash.in
+++ b/src/bin/gnucash.in
@@ -1,29 +1,5 @@
 #!/bin/sh
 
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@@-PATH_SEPARATOR-@${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}@-PATH_SEPARATOR-@@-GNC_SCM_INSTALL_DIR-@"
-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_PKGLIB_INSTALLDIR-@"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
-GNC_DBD_DIR="@-GNC_DBD_DIR-@"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DBD_DIR
+. @-BIN_DIR-@/gnucash-setup-env
 
 exec gnucash-bin "$@"