From 12392fcb440458e261a72b54c0eb8fd0c58631aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Thu, 22 Mar 2007 08:15:01 +0000
Subject: [PATCH] Install.sh: Do not mix pexports and ".." as noted by Nathan
 Buchanan.

pexports somestimes crashes in a new MSYS shell if a path, like the one
to a header file, contains "..".


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

diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index d331d03108..449a59afd4 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -663,12 +663,14 @@ function inst_hh() {
         smart_wget $HH_URL $DOWNLOAD_DIR
         echo "!!! When asked for an installation path, specify $HH_DIR !!!"
         $LAST_FILE
-        qpushd $HH_DIR/lib
+        qpushd $HH_DIR
            _HHCTRL_OCX=$(which hhctrl.ocx || true)
            [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
-           pexports -h ../include/htmlhelp.h $_HHCTRL_OCX > htmlhelp.def
-           ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
-           mv htmlhelp.lib htmlhelp.lib.bak
+           pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
+           qpushd lib
+               ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
+               mv htmlhelp.lib htmlhelp.lib.bak
+           qpopd
         qpopd
     fi
     quiet test_for_hh || die "html help workshop not installed correctly"