diff options
| author | Simon Rettberg | 2014-02-09 19:09:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-02-09 19:09:38 +0100 |
| commit | 9d280e98d7287c428c17c161d882055521066edf (patch) | |
| tree | b9bc79b82e89ce8f493d62aee3bdc04025fc7a17 /remote/modules/printergui/printergui.build | |
| parent | [rfs-stage31] Last benchmark event moved before umount (diff) | |
| parent | [printergui, vmchooser] Bugfixes, net systemd service etc., printpwgui (diff) | |
| download | tm-scripts-9d280e98d7287c428c17c161d882055521066edf.tar.gz tm-scripts-9d280e98d7287c428c17c161d882055521066edf.tar.xz tm-scripts-9d280e98d7287c428c17c161d882055521066edf.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/printergui/printergui.build')
| -rw-r--r-- | remote/modules/printergui/printergui.build | 10 |
1 files changed, 6 insertions, 4 deletions
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" |