diff options
| author | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
| commit | 5027bfbc817dc5620bbc222a47074f99bd340692 (patch) | |
| tree | c7e37f7f2e2f2c87aae2e5cdaa4f1c246b73e1fa /remote/modules/printergui | |
| parent | [rootfs-stage32] Remove retarded $PATH declaration from /etc/profile (diff) | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.gz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.xz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/printergui')
| -rw-r--r-- | remote/modules/printergui/printergui.build | 4 | ||||
| -rw-r--r-- | remote/modules/printergui/printergui.conf.opensuse | 7 | ||||
| -rw-r--r-- | remote/modules/printergui/printergui.conf.ubuntu | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/printergui.build index b414230c..f6139ba6 100644 --- a/remote/modules/printergui/printergui.build +++ b/remote/modules/printergui/printergui.build @@ -8,9 +8,9 @@ build() { local SRCDIR="${MODULE_DIR}/src/" mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" - cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Cpdspofj not cd!" + cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!" pinfo "Running qmake" - qmake-qt4 "$SRCDIR/src/printergui.pro" -r -spec linux-g++ || perror "'qmake' failed." + qmake "$SRCDIR/src/printergui.pro" -r -spec linux-g++ || perror "'qmake' failed." pinfo "Running make" make || perror "'make' failed." } diff --git a/remote/modules/printergui/printergui.conf.opensuse b/remote/modules/printergui/printergui.conf.opensuse new file mode 100644 index 00000000..2d4c7a95 --- /dev/null +++ b/remote/modules/printergui/printergui.conf.opensuse @@ -0,0 +1,7 @@ +REQUIRED_INSTALLED_PACKAGES=" +cups-devel +libqt4-devel +" +REQUIRED_CONTENT_PACKAGES=" +cups-devel +" diff --git a/remote/modules/printergui/printergui.conf.ubuntu b/remote/modules/printergui/printergui.conf.ubuntu index 3dc662fd..2f679912 100644 --- a/remote/modules/printergui/printergui.conf.ubuntu +++ b/remote/modules/printergui/printergui.conf.ubuntu @@ -1,5 +1,6 @@ REQUIRED_INSTALLED_PACKAGES=" libcups2-dev +libqt4-dev " REQUIRED_CONTENT_PACKAGES=" libcups2-dev |