Mercurial > mxe-octave
changeset 5347:4d6716dcec28
* tools/makeinst-script.sh.in: Install to ProgramFiles by default (bug #53124).
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 21 Feb 2020 12:29:08 +0100 |
| parents | e0fd834ea2e1 |
| children | eca81b345edf |
| files | tools/makeinst-script.sh.in |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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