r15747 - gnucash/trunk/packaging/win32 - Install.sh: Do not mix pexports and ".." as noted by Nathan Buchanan.
Andreas Köhler
andi5 at cvs.gnucash.org
Thu Mar 22 04:15:04 EDT 2007
Author: andi5
Date: 2007-03-22 04:15:01 -0400 (Thu, 22 Mar 2007)
New Revision: 15747
Trac: http://svn.gnucash.org/trac/changeset/15747
Modified:
gnucash/trunk/packaging/win32/install.sh
Log:
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 "..".
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-03-21 22:50:12 UTC (rev 15746)
+++ gnucash/trunk/packaging/win32/install.sh 2007-03-22 08:15:01 UTC (rev 15747)
@@ -663,12 +663,14 @@
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"
More information about the gnucash-changes
mailing list