Mercurial > mxe-octave
changeset 5134:0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
| author | John Donoghue |
|---|---|
| date | Wed, 31 Jul 2019 15:34:56 -0400 |
| parents | 30b1469591b6 |
| children | 6836b2f08479 |
| files | tools/makeinst-script.sh.in |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in Wed Jul 31 15:34:53 2019 -0400 +++ b/tools/makeinst-script.sh.in Wed Jul 31 15:34:56 2019 -0400 @@ -16,6 +16,12 @@ cd `dirname $1` MXEDIR=`cd ..; pwd` +if [ "@ENABLE_QT5@" == "yes" ]; then + QT_SUBDIR=qt5/ +else + QT_SUBDIR= +fi + if [ "@USE_MSYS2@" == "yes" ]; then if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then OCTAVE_SUBDIR=mingw64 @@ -298,8 +304,8 @@ ; add qt.conf Push \$0 \${StrRep} '\$0' '\$INSTDIR' '\\' '/' - WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0" - WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Translations" "translations" + WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0/$OCTAVE_SUBDIR" + WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Translations" "${QT_SUBDIR}translations" Pop \$0 ; run post-install script