From 7f63f35032f5f2ed934f0c7a323474578eb3edb4 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 12 Oct 2021 11:01:31 +0200
Subject: [looking-glass-client] Use CMake's generated install target for
 installation

---
 core/modules/looking-glass-client/module.build | 14 ++++++++------
 core/modules/looking-glass-client/module.conf  |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/modules/looking-glass-client/module.build b/core/modules/looking-glass-client/module.build
index 52609237..179d7e72 100644
--- a/core/modules/looking-glass-client/module.build
+++ b/core/modules/looking-glass-client/module.build
@@ -6,17 +6,19 @@ fetch_source() {
 
 build() {
 	local SRCDIR="${MODULE_WORK_DIR}/src/LookingGlass"
-	local CLIENTBUILDDIR="client/build"
-	mkdir -p "${SRCDIR}/${CLIENTBUILDDIR}" || perror "Failed to create CMake build directory!"
-	cde "${SRCDIR}/${CLIENTBUILDDIR}"
+	local DSTDIR="${MODULE_BUILD_DIR}"
+
+	mkdir -p "${SRCDIR}/client/build" || perror "Failed to create CMake build directory!"
+	cde "${SRCDIR}/client/build"
+
 	cmake -DENABLE_WAYLAND=no \
 		-DENABLE_X11=yes \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		../ || perror "'cmake' failed."
 	make || perror "'make' failed."
-	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/bin"
-	cp "${SRCDIR}/${CLIENTBUILDDIR}/looking-glass-client" "${MODULE_BUILD_DIR}/opt/openslx/bin/looking-glass-client" || perror "'cp' failed."
+	DESTDIR="${DSTDIR}" make install || perror "'make install' failed."
 }
 
 post_copy() {
 	:
-}
\ No newline at end of file
+}
diff --git a/core/modules/looking-glass-client/module.conf b/core/modules/looking-glass-client/module.conf
index a8e7263d..271680d5 100644
--- a/core/modules/looking-glass-client/module.conf
+++ b/core/modules/looking-glass-client/module.conf
@@ -1,7 +1,8 @@
 #!/bin/bash
-REQUIRED_BINARIES="
-	looking-glass-client
-"
+
 REQUIRED_GIT="
 	https://github.com/gnif/LookingGlass.git||Release/B4
 "
+
+# copy everything since there is a clean installation done by 'make install'
+REQUIRED_DIRECTORIES="/"
-- 
cgit v1.2.3-55-g7522