From 2fa9696eac4c7c3a0402eb4bb63cc9ed35e1b580 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Fri, 7 Feb 2014 19:09:01 +0100
Subject: [printergui, vmchooser] Bugfixes, net systemd service etc.,
 printpwgui

---
 remote/modules/printergui/printergui.build | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'remote/modules/printergui/printergui.build')

diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/printergui.build
index a11469d2..62b7c103 100644
--- a/remote/modules/printergui/printergui.build
+++ b/remote/modules/printergui/printergui.build
@@ -9,13 +9,15 @@ fetch_source() {
 
 build() {
 	local SRCDIR="${MODULE_DIR}/src/"
+	local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/cups"
 
-	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
-	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
-	pinfo "Running qmake"
-	qmake "$SRCDIR/src/printergui.pro" -r -spec linux-g++ || perror "'qmake' failed (e.g. not installed)."
+	mkdir -p "$DESTDIR"
+	cd "$DESTDIR" || perror "Could not cd to $DESTDIR!"
+	pinfo "Running cmake"
+	cmake "$SRCDIR/" || perror "'cmake' failed (e.g. not installed)."
 	pinfo "Running make"
 	make || perror "'make' failed."
+	chmod 0700 "$DESTDIR/printpwgui"	# So picky cupsd won't drop privileges to lp
 }
 post_copy() {
 	mkdir -p "${TARGET_BUILD_DIR}/var/spool/STANDARD"
-- 
cgit v1.2.3-55-g7522