From cf8b473d0a9232de236f3e1a620a123cd6cf2d36 Mon Sep 17 00:00:00 2001
From: Phil Longstaff <plongstaff@newearth.org>
Date: Tue, 18 Aug 2009 16:49:40 +0000
Subject: [PATCH] Fix win32 report directory startup problem on win32.

In order to help keep the various places run-time environment is created in sync, add a
comment to each place suggesting that environment changes should be reflected in all 4
places.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18263 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/gnucash.iss.in   | 4 ++++
 packaging/win32/install.sh       | 3 +++
 src/bin/gnucash-setup-env-osx.in | 3 +++
 src/bin/gnucash-setup-env.in     | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in
index 442f358650..84448b4bd0 100644
--- a/packaging/win32/gnucash.iss.in
+++ b/packaging/win32/gnucash.iss.in
@@ -190,6 +190,9 @@ begin
   pkgdatadir := appdir + '\share\gnucash';
 
   { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+
+  { If you make any changes here, you should probably also change the equivalent sections }
+  { in packaging/win32/install.sh, src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in }
   FileName := appdir + '\bin\gnucash.cmd' ;
   FileString := 'setlocal'#13#10 ;
   FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
@@ -201,6 +204,7 @@ begin
   FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
   FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
   FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
+  FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
   FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
   FileString := FileString + 'start gnucash-bin %*'#13#10 ;
 
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 4e444ead0d..66008631a8 100755
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -1286,6 +1286,9 @@ function make_install() {
 
     if [ -z $_skip_scripts ]; then
         # Create a startup script that works without the msys shell
+        # If you make any changes here, you should probably also change
+		# the equivalent sections in packaging/win32/gnucash.iss.in,
+		# src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in
         qpushd $_INSTALL_UDIR/bin
             echo "setlocal" > gnucash.cmd
             echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" >> gnucash.cmd
diff --git a/src/bin/gnucash-setup-env-osx.in b/src/bin/gnucash-setup-env-osx.in
index be330ed9c3..285a503045 100644
--- a/src/bin/gnucash-setup-env-osx.in
+++ b/src/bin/gnucash-setup-env-osx.in
@@ -1,3 +1,6 @@
+# If you make any changes here, you should probably also change the equivalent sections
+# in packaging/win32/gnucash.iss.in, packaging/win32/install.sh and src/bin/gnucash-setup-env.in
+
 PATH="@-BIN_DIR-@:${PATH}"
 export PATH
 XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg
diff --git a/src/bin/gnucash-setup-env.in b/src/bin/gnucash-setup-env.in
index 912008ef79..aaf1eea634 100644
--- a/src/bin/gnucash-setup-env.in
+++ b/src/bin/gnucash-setup-env.in
@@ -1,6 +1,10 @@
 # gnucash-setup-env
 #
 # Common environment setup used by different gnucash startup scripts
+#
+# If you make any changes here, you should probably also change the equivalent sections
+# in packaging/win32/gnucash.iss.in, packaging/win32/install.sh and
+# src/bin/gnucash-setup-env-osx.in
 
 PATH="@-BIN_DIR-@:${PATH}"
 export PATH