From 4b80125f42f7edb55f56c73401bd6eb838eca5db Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 23 May 2021 02:14:20 +0200
Subject: [PATCH] Makefile: dissociate Darwin and Brew

---
 Makefile.defs   |  4 ++--
 client/Makefile | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index 23dab5b32..5a6993228 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -50,6 +50,7 @@ else
 endif
 
 ifeq ($(platform),Darwin)
+  USE_BREW = 1
   AR= /usr/bin/ar rcs
   RANLIB= /usr/bin/ranlib
 else
@@ -57,8 +58,7 @@ else
   RANLIB= ranlib
 endif
 
-# For detection of Apple Silicon
-ifeq ($(platform),Darwin)
+ifeq ($(USE_BREW),1)
   BREW_PREFIX = $(shell brew --prefix)
 endif
 
diff --git a/client/Makefile b/client/Makefile
index e5ed43548..f865e608f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -13,7 +13,9 @@ VPATH =  ../common src
 vpath %.dic dictionaries
 OBJDIR = obj
 
-ifeq ($(platform),Darwin)
+ifeq ($(USE_BREW),1)
+	INCLUDES += -I$(BREW_PREFIX)/include
+	LDLIBS += -L$(BREW_PREFIX)/lib
 	PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig
 	PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
 endif
@@ -276,9 +278,9 @@ CXXINCLUDES += $(QTINCLUDES)
 
 ## Readline
 ifneq ($(SKIPREADLINE),1)
-    ifeq ($(platform),Darwin)
-		LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
-		INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
+    ifeq ($(USE_BREW),1)
+        LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
+        INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
     endif
     LDLIBS += -lreadline
     READLINE_FOUND = 1