From 1a99c9382eb1e2f1dd6d8f5eb0f0665aa7eeac7a Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sun, 13 Aug 2023 12:06:19 -0400
Subject: [PATCH] Qt6 on Linux Makefile tweak

---
 sys/unix/hints/linux.370 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370
index d6f3d1289..6851f686e 100755
--- a/sys/unix/hints/linux.370
+++ b/sys/unix/hints/linux.370
@@ -225,9 +225,14 @@ MOCPATH = $(QTDIR)/libexec/moc
 WINLIB += -L$(QTDIR)/lib -lQt6Widgets -lQt6Multimedia -lQt6Network -lQt6Gui -lQt6Core
 endif   # QTLOCATED
 else    # !QT6MANUAL
-QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --cflags))
-WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --libs)
+MOCDIR = $(shell pkg-config Qt6Gui --variable=libexecdir)
+ifneq ($(wildcard $(MOCDIR)/*),)
+MOCPATH = $(MOCDIR)/moc
+else
 MOCPATH = /usr/lib/qt6/libexec/moc
+endif   # MOCDIR
+QTCXXFLAGS += $(sort $(shell pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --cflags))
+WINLIB += $(shell pkg-config Qt6Gui Qt6Widgets Qt6Multimedia --libs)
 endif   # QT6MANUAL
 endif   # WANT_WIN_QT6
 ifndef QTDIR