X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-windows-installer.sh;h=3b10048a6ad2927c254d63ec439cce86e525a231;hb=0ebaa8ecfbe36286db0b4b380ba145af9695acca;hp=a7e4886467bd36888706f6b2613b081ba7241c56;hpb=359c7f002c22bdfebffb87e2a4c23bab7da4b393;p=sbcl.git

diff --git a/make-windows-installer.sh b/make-windows-installer.sh
index a7e4886..3b10048 100644
--- a/make-windows-installer.sh
+++ b/make-windows-installer.sh
@@ -9,7 +9,14 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-WIX_PATH="${WIX_PATH:-$PROGRAMFILES\Windows Installer XML v3.5\bin}"
+if test -n "$WIX_PATH"; then
+    :
+elif test -d "$PROGRAMFILES/WiX Toolset v3.7"; then
+    WIX_PATH="$PROGRAMFILES/WiX Toolset v3.7/bin"
+elif test -d "$PROGRAMFILES/Windows Installer XML v3.5"; then
+    WIX_PATH="$PROGRAMFILES/Windows Installer XML v3.5/bin"
+fi
+echo "using $WIX_PATH"
 
 . ./sbcl-pwd.sh
 sbcl_pwd