From cd3df9ae82c6157c656f941c9d6c32da02c3befd Mon Sep 17 00:00:00 2001 From: Charles Day Date: Mon, 13 Jul 2009 20:38:44 +0000 Subject: [PATCH] Patch by John Ralls. Provides (and installs when appropriate) a special gnucash-setup-env for OSX. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18206 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/bin/Makefile.am | 8 +++++--- src/bin/gnucash-setup-env-osx.in | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 src/bin/gnucash-setup-env-osx.in diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index b39fd7b078..0600f4ef39 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -54,7 +54,7 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile mv $@.tmp $@ chmod u+x $@ -gnucash-setup-env: gnucash-setup-env.in ${top_builddir}/config.status Makefile +gnucash-setup-env: ${GNUCASH_SETUP_ENV}.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's#@-BIN_DIR-@#${bindir}#g' \ @@ -64,7 +64,8 @@ gnucash-setup-env: gnucash-setup-env.in ${top_builddir}/config.status Makefile -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#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g' \ + -e 's#@-PREFIX-@#${prefix}#g' mv $@.tmp $@ chmod u+x $@ @@ -104,7 +105,8 @@ EXTRA_DIST = \ gnucash.in \ gnucash-valgrind.in \ gnucash-gdb.in \ - gnucash-setup-env.in + gnucash-setup-env.in\ + gnucash-setup-env-osx.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-setup-env-osx.in b/src/bin/gnucash-setup-env-osx.in new file mode 100644 index 0000000000..4d8496b457 --- /dev/null +++ b/src/bin/gnucash-setup-env-osx.in @@ -0,0 +1,33 @@ +PATH="@-BIN_DIR-@:${PATH}" +export PATH +XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg +export XDG_CONFIG_DIRS +XDG_DATA_DIRS=@-PREFIX-@/share +export XDG_DATA_DIRS + + +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}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/" +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}" + +export GNC_MODULE_PATH +export GUILE_LOAD_PATH +export LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH + +if test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf` +fi \ No newline at end of file