From f4a5fe38c6e3e7f71543bc653202c455628118f1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Tue, 17 May 2022 00:06:24 -0700
Subject: [PATCH] recoll-win.pro: use variable for build location

---
 packaging/mac/make-recoll-dmg.sh | 13 ++++++-------
 src/qtgui/recoll-win.pro         | 16 +++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packaging/mac/make-recoll-dmg.sh b/packaging/mac/make-recoll-dmg.sh
index 13cb9b52..70c2e721 100644
--- a/packaging/mac/make-recoll-dmg.sh
+++ b/packaging/mac/make-recoll-dmg.sh
@@ -13,10 +13,9 @@ usage()
 # Adjustable things
 top=~/Recoll
 # The possibly bogus version we have in paths (may be harcoded in the .pro)
-# qtpathversion=Desktop_Qt_5_15_2
-qtpathversion=Qt_6_2_4
-# path_clang=clang_64bit
-path_clang=for_macOS
+# qcbuildloc=Desktop_Qt_5_15_2_clang_64bit
+qcbuildloc=Qt_6_2_4_for_macOS
+
 # qtversion=5.15.2
 qtversion=6.2.4
 
@@ -24,9 +23,9 @@ qtversion=6.2.4
 deploy=~/Qt/${qtversion}/macos/bin/macdeployqt
 
 toprecoll=$top/recoll/src
-appdir=$toprecoll/build-recoll-win-${qtpathversion}_${path_clang}-Release/recoll.app
-rclindexdir=$toprecoll/windows/build-recollindex-${qtpathversion}_${path_clang}-Release
-rclqdir=$toprecoll/windows/build-recollq-${qtpathversion}_${path_clang}-Release
+appdir=$toprecoll/build-recoll-win-${qcbuildloc}-Release/recoll.app
+rclindexdir=$toprecoll/windows/build-recollindex-${qcbuildloc}-Release
+rclqdir=$toprecoll/windows/build-recollq-${qcbuildloc}-Release
 bindir=$appdir/Contents/MacOS
 datadir=$appdir/Contents/Resources
 
diff --git a/src/qtgui/recoll-win.pro b/src/qtgui/recoll-win.pro
index bae3cd37..0956ab81 100644
--- a/src/qtgui/recoll-win.pro
+++ b/src/qtgui/recoll-win.pro
@@ -124,6 +124,7 @@ windows {
   DEFINES += __WIN32__
   DEFINES += UNICODE
   RC_FILE = recoll.rc
+  QCBUILDLOC = Desktop_Qt_5_14_2_MSVC2017_32bit
 
   HEADERS += \
     winschedtool.h
@@ -144,13 +145,13 @@ windows {
     RECOLLDEPS = ../../../recolldeps/msvc
     DEFINES += USING_STATIC_LIBICONV
     PRE_TARGETDEPS = \
-      ../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/librecoll.lib
+      ../windows/build-librecoll-$$QCBUILDLOC-Release/release/librecoll.lib
     LIBS += \
-      -L../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibrecoll \
+      -L../windows/build-librecoll-$$QCBUILDLOC-Release/release -llibrecoll \
       $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
       $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-      -L../windows/build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibxapian \
-      -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibiconv \
+      -L../windows/build-libxapian-$$QCBUILDLOC-Release/release -llibxapian \
+      -L$$RECOLLDEPS/build-libiconv-$$QCBUILDLOC-Release/release -llibiconv \
       $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
       -lrpcrt4 -lws2_32 -luser32 -lshell32 -lshlwapi -lpsapi -lkernel32
   }
@@ -159,7 +160,8 @@ windows {
 mac {
   QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
   QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
-
+  QCBUILDLOC=Qt_6_2_4_for_macOS
+  
   HEADERS += \
     crontool.h \
     rtitool.h
@@ -177,8 +179,8 @@ mac {
     rtitool.ui
 
   LIBS += \
-    ../windows/build-librecoll-Qt_6_2_4_for_macOS-Release/liblibrecoll.a \
-    ../windows/build-libxapian-Qt_6_2_4_for_macOS-Release/liblibxapian.a \
+    ../windows/build-librecoll-$$QCBUILDLOC-Release/liblibrecoll.a \
+    ../windows/build-libxapian-$$QCBUILDLOC-Release/liblibxapian.a \
     -lxslt -lxml2 -liconv -lz
 
   ICON = images/recoll.icns