[gnumeric] Win32: wine installs is a different Program Files directory, it seems.



commit 67baba754c71fa6ba668a30c302fe53d5ff09258
Author: Morten Welinder <terra gnome org>
Date:   Sat Dec 20 10:34:58 2014 -0500

    Win32: wine installs is a different Program Files directory, it seems.

 tools/win32/ChangeLog |    5 +++++
 tools/win32/build     |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index ba3bc60..ca4b9d8 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-20  Morten Welinder <terra gnome org>
+
+       * build (archive_dir): Wine seems to have changed a bit.  Make up
+       for that.
+
 2014-09-25  Morten Welinder <terra gnome org>
 
        * Release 1.12.18
diff --git a/tools/win32/build b/tools/win32/build
index e8a45b9..337673a 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -88,9 +88,9 @@ setup_html_help() {
 
 # Download HTML Help
     if [ ! -f "${archive_dir}/htmlhelp.exe" ]; then
-       ( download 'http://go.microsoft.com/fwlink/?LinkId=14188' )
+       ( download 
'http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe' )
     fi
-    if [ ! -d "${WINEDIR}/Program Files/HTML Help Workshop" ]; then
+    if [ ! '(' -d "${WINEDIR}/Program Files/HTML Help Workshop" -o -d "${WINEDIR}/Program Files (x86)/HTML 
Help Workshop" ')' ]; then
        ( setup_html_help )
     fi
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]