Mercurial > mxe-octave

diff tools/makeinst-script.sh.in @ 6924:f04699caf98e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qt.conf generation when using qt6 * installer-files/post-install.bat, tools/makeinst-script.sh.in: : set qt paths to include qt6 when using qt6
author John Donoghue <john.donoghue@ieee.org>
date Fri, 13 Oct 2023 07:41:16 -0400
parents bcdb1e0924d9
children c9c411f5db86
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Thu Oct 12 20:31:13 2023 +0200
+++ b/tools/makeinst-script.sh.in	Fri Oct 13 07:41:16 2023 -0400
@@ -16,10 +16,14 @@
 cd `dirname $1`
 MXEDIR=`cd ..; pwd`
 
-if [ "@ENABLE_QT5@" == "yes" ]; then
-  QT_SUBDIR=qt5/
+if [ "@ENABLE_QT@" == "4" ]; then
+  QT_SUBDIR=
 else
-  QT_SUBDIR=
+  if [ "@ENABLE_QT@" == "5" ]; then
+    QT_SUBDIR=qt5/
+  else
+    QT_SUBDIR=qt6/
+  fi
 fi
 
 if [ "@USE_MSYS2@" == "yes" ]; then