From 7fa3e6ef9090439666addb2390f64db29c2541f8 Mon Sep 17 00:00:00 2001
From: Vijay Aravamudhan <vraravam@users.noreply.github.com>
Date: Tue, 18 Oct 2022 01:51:50 +0530
Subject: Allow for homebrew prefix location to handle both x64 and arm macs
 (#8593)

Allow for Homebrew prefix location to handle both x64 and arm macs
---
 INSTALL.md               | 4 ++--
 release-tool             | 7 +++++++
 utils/keepassxc-keychain | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 0e4dd07fd..4d6b4a646 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -78,7 +78,7 @@ Note: These steps place the compiled KeePassXC binary inside the `./build/src/`
 
 If you installed Qt5 via Homebrew, you should be able to compile KeePassXC without any changes. If CMake fails to find your Qt installation, you can specify it manually by adding the following parameter:
 
-`-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake`
+`-DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake`
 
 (or whatever your Qt installation path is)
 
@@ -98,7 +98,7 @@ CMake Configuration Options
 ## Common Parameters
 
 ```
--DCMAKE_INSTALL_PREFIX=/usr/local
+-DCMAKE_INSTALL_PREFIX=$(brew --prefix)
 -DCMAKE_VERBOSE_MAKEFILE=ON
 -DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
 -DWITH_GUI_TESTS=ON
diff --git a/release-tool b/release-tool
index 6d8310d7b..9e1a95784 100755
--- a/release-tool
+++ b/release-tool
@@ -930,6 +930,13 @@ build() {
         # linuxdeploy requires /usr as install prefix
         INSTALL_PREFIX="/usr"
     fi
+    if [ -n "$OS_MACOS" ]; then
+      type brew &> /dev/null 2>&1
+      if [ $? -eq 0 ]; then
+        INSTALL_PREFIX=$(brew --prefix)
+      fi
+    fi
+
     # Do not build tests cases
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DWITH_TESTS=OFF"
 
diff --git a/utils/keepassxc-keychain b/utils/keepassxc-keychain
index 5a6093bdb..e671c5699 100755
--- a/utils/keepassxc-keychain
+++ b/utils/keepassxc-keychain
@@ -5,7 +5,7 @@
 : ${KDBX_SEARCH:=~/.KeePass/*.kdbx}
 
 PROG=$(basename "$0")
-KeePassXC=$(ls -f {/usr/local,/Applications}/KeePassXC.app/Contents/MacOS/KeePassXC 2>/dev/null | head -1)
+KeePassXC=$(ls -f {/usr/local,/opt/homebrew,/Applications}/KeePassXC.app/Contents/MacOS/KeePassXC 2>/dev/null | head -1)
 
 daemon_main() {
   declare -A DBs
-- 
cgit v1.2.3