From: nhmall <nhmall@nethack.org>
Date: Thu, 16 Jun 2022 02:22:15 +0000 (-0400)
Subject: recent changes caused a compile issue with QT
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab169d7961450c1eaabfdc2becee701ba8d73d97;p=nethack

recent changes caused a compile issue with QT

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.
---

diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370
index c3df30152..288b1b9ee 100755
--- a/sys/unix/hints/macOS.370
+++ b/sys/unix/hints/macOS.370
@@ -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