r19197 - gnucash/trunk/src/bin - Fix gnc_dbd_dir foulup

[John Ralls]

Author: jralls
Date: 2010-05-21 16:45:05 -0400 (Fri, 21 May 2010)
New Revision: 19197
Trac: http://svn.gnucash.org/trac/changeset/19197

Modified:
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/bin/gnucash-setup-env-osx.in
Log:
Fix gnc_dbd_dir foulup

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-05-21 19:37:23 UTC (rev 19196)
+++ gnucash/trunk/src/bin/Makefile.am	2010-05-21 20:45:05 UTC (rev 19197)
@@ -99,7 +99,7 @@
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's#@-BIN_DIR-@#${bindir}#g' \
-	    -e 's#@-gnc_dbd_dir_override-@#${gnc_dbd_dir_override}#g' \
+	    -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \ 
 	    -e 's#@-GNC_STANDARD_REPORTS_DIR-@#${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports#g' \
 	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
 	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \

Modified: gnucash/trunk/src/bin/gnucash-setup-env-osx.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env-osx.in	2010-05-21 19:37:23 UTC (rev 19196)
+++ gnucash/trunk/src/bin/gnucash-setup-env-osx.in	2010-05-21 20:45:05 UTC (rev 19197)
@@ -25,8 +25,8 @@
 
 LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
 DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
+GNC_DBD_DIR="@-GNC_DBD_DIR-@"
 GNC_STANDARD_REPORTS_DIR="@-GNC_STANDARD_REPORTS_DIR-@"
- at -CUSTOM_GNC_DBD_DIR-@"
 
 export GNC_MODULE_PATH
 export GUILE_LOAD_PATH