r19047 - gnucash/trunk/src/bin - Makefile fixes for setup-gnucash-env on OS X

[Geert Janssens]

Author: gjanssens
Date: 2010-04-22 05:14:53 -0400 (Thu, 22 Apr 2010)
New Revision: 19047
Trac: http://svn.gnucash.org/trac/changeset/19047

Modified:
   gnucash/trunk/src/bin/Makefile.am
Log:
Makefile fixes for setup-gnucash-env on OS X

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-04-21 22:52:27 UTC (rev 19046)
+++ gnucash/trunk/src/bin/Makefile.am	2010-04-22 09:14:53 UTC (rev 19047)
@@ -38,7 +38,7 @@
 config_DATA = environment
 
 if PLATFORM_OSX_QUARTZ
-PRE_RUN = '. @-BIN_DIR-@/gnucash_setup_env'
+PRE_RUN = . ${bindir}/gnucash-setup-env
 PLATFORM_FILES = gnucash-setup-env
 else
 PRE_RUN =
@@ -130,7 +130,8 @@
 	update-gnucash-gconf \
 	gnucash \
 	gnucash-valgrind \
-	gnucash-gdb
+	gnucash-gdb \
+	${PLATFORM_FILES}
 
 # if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
 gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
@@ -143,8 +144,7 @@
 	gnucash-gdb.in \
 	environment.in \
 	environment-win32.in \
-	environment-osx.in \
-	${PLATFORM_FILES}
+	environment-osx.in
 
 ## Gnucash scripts -- real code is in overrides, these just get you there.
 ${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status