From 987b5417fea181f2fe02cdc198850fe36076c919 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 25 Jun 2013 14:20:18 +0200 Subject: Better detection of pango-querymodules/pango-querymodules-64 in case of 64bit OS --- remote/modules/openbox/openbox.build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build index f3ce1448..0cd6aaad 100644 --- a/remote/modules/openbox/openbox.build +++ b/remote/modules/openbox/openbox.build @@ -21,10 +21,16 @@ post_copy() { # pango-querymodules-64, not pango-querymodules. which pango-querymodules 2>/dev/null 1>&2 ERR=$? - if [[ "$ERR" -ne 0 ]]; then - PANGO_QUERYMODULES_ARCH=pango-querymodules-64 - else + 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" } -- cgit v1.2.3-55-g7522