r14815 - gnucash/trunk/packaging/win32 - Fix automated path setup of gnucash script. Should now probably work.

[Christian Stimming]

Author: cstim
Date: 2006-09-07 08:49:39 -0400 (Thu, 07 Sep 2006)
New Revision: 14815
Trac: http://svn.gnucash.org/trac/changeset/14815

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
Fix automated path setup of gnucash script. Should now probably work.

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-09-07 11:55:52 UTC (rev 14814)
+++ gnucash/trunk/packaging/win32/install.sh	2006-09-07 12:49:39 UTC (rev 14815)
@@ -676,6 +676,7 @@
 function inst_gnucash() {
     setup GnuCash
     _GNUCASH_WFSDIR=`win_fs_path $GNUCASH_DIR`
+    _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
     POPT_CPPFLAGS="-I${_GNOME_UDIR}/include"
     POPT_LDFLAGS="-L${_GNOME_UDIR}/lib"
     qpushd $REPOS_DIR
@@ -706,8 +707,9 @@
     # Try to fix the paths in the "gnucash" script
     qpushd src/bin
     rm gnucash
-    make PATH_SEPARATOR=";" gnucash
-    # FIXME: Still not all paths are set up correctly.
+    make PATH_SEPARATOR=";" \
+	bindir="${_GNUCASH_UDIR}/bin:${_GNUCASH_UDIR}/lib/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GWRAP_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin" \
+	gnucash
     qpopd
 
     make install