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
This commit is contained in:
Charles Day 2009-07-13 20:38:44 +00:00
parent f729c3ec94
commit cd3df9ae82
2 changed files with 38 additions and 3 deletions

View File

@ -54,7 +54,7 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
mv $@.tmp $@ mv $@.tmp $@
chmod u+x $@ 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 rm -f $@.tmp
sed < $< > $@.tmp \ sed < $< > $@.tmp \
-e 's#@-BIN_DIR-@#${bindir}#g' \ -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_LIB_INSTALLDIR-@#${libdir}#' \
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \ -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
-e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#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 $@ mv $@.tmp $@
chmod u+x $@ chmod u+x $@
@ -104,7 +105,8 @@ EXTRA_DIST = \
gnucash.in \ gnucash.in \
gnucash-valgrind.in \ gnucash-valgrind.in \
gnucash-gdb.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. ## Gnucash scripts -- real code is in overrides, these just get you there.
${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status ${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status

View File

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