]> granicus.if.org Git - nethack/commitdiff
recent changes caused a compile issue with QT
authornhmall <nhmall@nethack.org>
Thu, 16 Jun 2022 02:22:15 +0000 (22:22 -0400)
committernhmall <nhmall@nethack.org>
Thu, 16 Jun 2022 02:22:15 +0000 (22:22 -0400)
On a machine with both homebrew and macports, the presence of
macports was causing the homebrew Qt settings to be overwritten
right after they were set. Check to see if QTDIR is already
defined before proceeding with QT macports.

sys/unix/hints/macOS.370

index c3df3015296b3b0e84af7a46807071c8144755e6..288b1b9eef053d560ed55ca140b9a639b6de909b 100755 (executable)
@@ -63,6 +63,7 @@ ifdef WANT_WIN_QT6
 QTDIR :=$(shell brew --prefix)/opt/qt@6
 endif   # WANT_WIN_QT6
 endif   # HAVE_HOMEBREW
+ifndef QTDIR
 ifeq "$(HAVE_MACPORTS)" "1"
 ifdef WANT_WIN_QT5
 # Qt5 installed via macports
@@ -72,6 +73,7 @@ ifdef WANT_WIN_QT6
 QTDIR=/opt/local/libexec/qt6
 endif   # WANT_WIN_QT6
 endif   # HAVE_MACPORTS
+endif   # QTDIR
 endif  # WANT_WIN_QT
 
 ifndef LIBXPM