diff options
| author | Simon Rettberg | 2013-06-26 19:06:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-26 19:06:48 +0200 |
| commit | 6e0ec594c23313ccfa7737b20f96af287137d67c (patch) | |
| tree | dee10b6ccc641b984e9e1ab4a4d7149876025594 /remote/modules/openbox | |
| parent | [kdm] bwLehrpool Theme (diff) | |
| parent | Library paths changed to reflect openSuse 64bit ($LIB64) (diff) | |
| download | tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.tar.gz tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.tar.xz tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/openbox')
| -rw-r--r-- | remote/modules/openbox/openbox.build | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build index 51c6beec..0cd6aaad 100644 --- a/remote/modules/openbox/openbox.build +++ b/remote/modules/openbox/openbox.build @@ -16,5 +16,21 @@ build() { post_copy() { [ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango" - pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules" + + # little Workaround, as under e.g. 64bit Suse the binary is called + # pango-querymodules-64, not pango-querymodules. + which pango-querymodules 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -eq 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules + else + which pango-querymodules-64 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -eq 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules-64 + else + perror "Could not find either pango-querymodules or pango-querymodules-64!" + fi + fi + $PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules" } |