# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1582284548 -3600
# Node ID 4d6716dcec281f3a9cd0ce6b61f6a186ca929d4a
# Parent  e0fd834ea2e1bd3d696edc92ed589cb9abe4c7de
* tools/makeinst-script.sh.in: Install to ProgramFiles by default (bug #53124).

diff -r e0fd834ea2e1 -r 4d6716dcec28 tools/makeinst-script.sh.in
--- a/tools/makeinst-script.sh.in	Wed Mar 11 10:30:18 2020 -0400
+++ b/tools/makeinst-script.sh.in	Fri Feb 21 12:29:08 2020 +0100
@@ -32,6 +32,11 @@
   OCTAVE_SUBDIR=
 fi
 
+if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then
+  OCTAVE_INSTDIR="\$PROGRAMFILES64\\GNU Octave\\Octave-\${OCTAVE_VERSION}"
+else
+  OCTAVE_INSTDIR="\$PROGRAMFILES\\GNU Octave\\Octave-\${OCTAVE_VERSION}"
+fi
 
 if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then
   DEFAULT_BLAS="OpenBLAS"
@@ -91,7 +96,7 @@
 BrandingText "\${APP_NAME}"
 XPStyle on
 ManifestDPIAware true
-InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}"
+InstallDir "$OCTAVE_INSTDIR"
 Icon "\${INSTALLER_FILES}/octave-logo.ico"
 
 ######################################################################
@@ -676,9 +681,6 @@
 space_loop:
   StrCpy \$R0 \$INSTDIR 1 \$R1  # R0 = character in string to check
   StrCmp \$R0 "" space_end # end of string
-  StrCmp \$R0 " " space_found
-  StrCmp \$R0 "(" space_found
-  StrCmp \$R0 ")" space_found
   StrCmp \$R0 "&" space_found
   StrCmp \$R0 "%" space_found
   StrCmp \$R0 "^" space_found