From 326eee4cb6c6f791244d4e2f4052e931486209fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Wed, 6 Feb 2008 23:38:37 +0000
Subject: [PATCH] Win32: Provide make_install.sh with some vars, make it more
 robust.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16930 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/install.sh      | 4 ++--
 packaging/win32/make_install.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index a737666b43..1e71b1e8d8 100755
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -1012,7 +1012,7 @@ function make_install() {
         # correct the 'dlname' in the libtool archives. We do not use these
         # files to dlopen the modules, so actually this is unneeded.
         # Also, in all installed .la files, remove the dependency_libs line
-        mv bin/*.dll gnucash || true
+        mv bin/*.dll gnucash 2>/dev/null || true
         for A in gnucash/*.la; do
             sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
         done
@@ -1022,7 +1022,7 @@ function make_install() {
 
         # gettext 0.17 installs translations to \share\locale, but not all
         # gnome packages have been recompiled against it
-        cp -a locale ../share && rm -rf locale
+        [ -d locale ] && cp -a locale ../share && rm -rf locale
     qpopd
 
     qpushd $_INSTALL_UDIR/etc/gconf/schemas
diff --git a/packaging/win32/make_install.sh b/packaging/win32/make_install.sh
index 3c2473093c..2c67754bbe 100644
--- a/packaging/win32/make_install.sh
+++ b/packaging/win32/make_install.sh
@@ -9,10 +9,12 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
 qpushd "$(dirname $(unix_path "$0"))"
 . functions.sh
 . defaults.sh
-
 reset_steps
 . install.sh
+qpopd
 
 prepare
-qpopd
+_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
+_INSTALL_UDIR=`unix_path $INSTALL_DIR`
+
 make_install