From 71552c5a2fd3ad0b928cc06d4a9ae7bb583e8056 Mon Sep 17 00:00:00 2001
From: Rory Fewell <roryf@oddmatics.uk>
Date: Tue, 1 Aug 2023 18:20:56 +0100
Subject: [PATCH] Bugfix: Fixes #207, Build fails on Linux Mint

---
 packaging/build.sh                        | 5 +++--
 packaging/buildall.sh                     | 2 +-
 packaging/cmake-inc/packaging/PKGBUILD.in | 2 +-
 packaging/deb/pkgimpl.sh                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packaging/build.sh b/packaging/build.sh
index 3f8c96e..02c8822 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -115,8 +115,9 @@ build_result=0
 
 cd "${full_build_dir}"
 
-cmake --fresh                                        \
-      -DBUILD_SHARED_LIBS=ON                         \
+rm -rf "${full_build_dir}"/*
+
+cmake -DBUILD_SHARED_LIBS=ON                         \
       -DCMAKE_INSTALL_PREFIX=/usr                    \
       -DWINTC_SKU="${OPT_SKU}"                       \
       -DWINTC_PKGMGR="${dist_id}"                    \
diff --git a/packaging/buildall.sh b/packaging/buildall.sh
index 901f0f5..1feaa60 100755
--- a/packaging/buildall.sh
+++ b/packaging/buildall.sh
@@ -41,7 +41,7 @@ do
             ;;
 
         h)
-            echo "Usage: buildall.sh [-chos]"
+            echo "Usage: buildall.sh [-chosz]"
             echo " -c : provide a list of components (default 'targets')"
             echo " -h : display this help screen"
             echo " -o : specify output directory for packages"
diff --git a/packaging/cmake-inc/packaging/PKGBUILD.in b/packaging/cmake-inc/packaging/PKGBUILD.in
index 9c55156..086c2e2 100644
--- a/packaging/cmake-inc/packaging/PKGBUILD.in
+++ b/packaging/cmake-inc/packaging/PKGBUILD.in
@@ -11,5 +11,5 @@ package()
     @ARCH_DEPENDENCIES@
 
     cd ..
-    make install DESTDIR="$pkgdir/" CMAKE_INSTALL_ALWAYS=1
+    make install DESTDIR="$pkgdir/"
 }
diff --git a/packaging/deb/pkgimpl.sh b/packaging/deb/pkgimpl.sh
index bb20053..ab348c5 100755
--- a/packaging/deb/pkgimpl.sh
+++ b/packaging/deb/pkgimpl.sh
@@ -21,7 +21,7 @@ do_packaging()
     # Assemble package
     #
     cd "${full_component_dir}"
-    make install DESTDIR="${pkg_dir}" CMAKE_INSTALL_ALWAYS=1
+    make install DESTDIR="${pkg_dir}"
 
     ass_res=$?