r18206 - gnucash/trunk/src/bin - Patch by John Ralls. Provides (and installs when appropriate) a special gnucash-setup-env for OSX.

[Charles Day]

Author: cedayiv
Date: 2009-07-13 16:38:44 -0400 (Mon, 13 Jul 2009)
New Revision: 18206
Trac: http://svn.gnucash.org/trac/changeset/18206

Added:
   gnucash/trunk/src/bin/gnucash-setup-env-osx.in
Modified:
   gnucash/trunk/src/bin/Makefile.am
Log:
Patch by John Ralls. Provides (and installs when appropriate) a special gnucash-setup-env for OSX.


Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2009-07-13 20:34:42 UTC (rev 18205)
+++ gnucash/trunk/src/bin/Makefile.am	2009-07-13 20:38:44 UTC (rev 18206)
@@ -54,7 +54,7 @@
 	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 @@
         -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 @@
 	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

Added: gnucash/trunk/src/bin/gnucash-setup-env-osx.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env-osx.in	                        (rev 0)
+++ gnucash/trunk/src/bin/gnucash-setup-env-osx.in	2009-07-13 20:38:44 UTC (rev 18206)
@@ -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