Mercurial > mxe-octave

comparison tools/makeinst-script.sh.in @ 5134:0ff5f24c0862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 cd7689f3fcd8
children 6836b2f08479
comparison
equal deleted inserted replaced
5133:30b1469591b6 5134:0ff5f24c0862
13 13
14 OCTAVE_SOURCE=`basename $1` 14 OCTAVE_SOURCE=`basename $1`
15 15
16 cd `dirname $1` 16 cd `dirname $1`
17 MXEDIR=`cd ..; pwd` 17 MXEDIR=`cd ..; pwd`
18
19 if [ "@ENABLE_QT5@" == "yes" ]; then
20 QT_SUBDIR=qt5/
21 else
22 QT_SUBDIR=
23 fi
18 24
19 if [ "@USE_MSYS2@" == "yes" ]; then 25 if [ "@USE_MSYS2@" == "yes" ]; then
20 if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then 26 if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then
21 OCTAVE_SUBDIR=mingw64 27 OCTAVE_SUBDIR=mingw64
22 else 28 else
296 cat >> $OUTFILE << EOF 302 cat >> $OUTFILE << EOF
297 303
298 ; add qt.conf 304 ; add qt.conf
299 Push \$0 305 Push \$0
300 \${StrRep} '\$0' '\$INSTDIR' '\\' '/' 306 \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
301 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0" 307 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0/$OCTAVE_SUBDIR"
302 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Translations" "translations" 308 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Translations" "${QT_SUBDIR}translations"
303 Pop \$0 309 Pop \$0
304 310
305 ; run post-install script 311 ; run post-install script
306 GetFullPathName /SHORT \$1 \$INSTDIR 312 GetFullPathName /SHORT \$1 \$INSTDIR
307 DetailPrint "Running post install script (May take a while) ..." 313 DetailPrint "Running post install script (May take a while) ..."