From eca2f47a2a9aa729a39147c0b5e2dd62a39b6193 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Wed, 21 Apr 2021 14:12:56 +0200
Subject: [PATCH] none

---
 packaging/mac/make-recoll-dmg.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packaging/mac/make-recoll-dmg.sh b/packaging/mac/make-recoll-dmg.sh
index 71e0f5a9..09ea5ba1 100644
--- a/packaging/mac/make-recoll-dmg.sh
+++ b/packaging/mac/make-recoll-dmg.sh
@@ -10,12 +10,19 @@ usage()
     fatal make-recoll-dmg.sh
 }
 
-deploy=~/Qt/5.14.2/clang_64/bin/macdeployqt
-
+# Adjustable things
 top=~/Recoll
+qtversion=5.14.2
+# Will probably need adjustment on M1
+path_clang=clang_64
+deploy=~/Qt/${qtversion}/${path_clang}/bin/macdeployqt
+
+
+qt_ver_sion=`echo $qtversion | sed -e 's/\./_/g'`
+
 toprecoll=$top/recoll/src
-appdir=$toprecoll/build-recoll-win-Desktop_Qt_5_14_2_clang_64bit-Release/recoll.app
-rclindexdir=$toprecoll/windows/build-recollindex-Desktop_Qt_5_14_2_clang_64bit-Release
+appdir=$toprecoll/build-recoll-win-Desktop_Qt_${qt_ver_sion}_${path_clang}bit-Release/recoll.app
+rclindexdir=$toprecoll/windows/build-recollindex-Desktop_Qt_${qt_ver_sion}_${path_clang}bit-Release
 bindir=$appdir/Contents/MacOS
 datadir=$appdir/Contents/Resources
 
@@ -37,8 +44,7 @@ rm -f $dmg ~/Documents/recoll-$version-*.dmg
 $deploy $appdir -dmg || exit 1
 
 
-
-hash=`(cd recoll;git log -n 1  | head -1  | awk '{print $2}' |cut -b 1-8)`
+hash=`(cd $top/recoll;git log -n 1  | head -1  | awk '{print $2}' |cut -b 1-8)`
 
 mv $dmg ~/Documents/recoll-$version-$hash.dmg || exit 1
 ls -l ~/Documents/recoll-$version-*.dmg