diff -urN caribou-0.4.5.orig/bin/antler-keyboard.in caribou-0.4.5/bin/antler-keyboard.in --- caribou-0.4.5.orig/bin/antler-keyboard.in 2012-11-20 23:11:25.000000000 +0530 +++ caribou-0.4.5/bin/antler-keyboard.in 2012-12-18 20:19:17.253252756 +0530 @@ -18,6 +18,19 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +ARCH=$(uname -m) + +case $ARCH in +x86_64 | sparc64 | s390x | ppc64) +LIB_DIR=/usr/lib64 +SECONDARY_LIB_DIR=/usr/lib +;; +* ) +LIB_DIR=/usr/lib +SECONDARY_LIB_DIR=/usr/lib64 +;; +esac + script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ @@ -27,8 +40,8 @@ then datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" else export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" diff -urN caribou-0.4.5.orig/bin/caribou.in caribou-0.4.5/bin/caribou.in --- caribou-0.4.5.orig/bin/caribou.in 2012-11-20 23:11:25.000000000 +0530 +++ caribou-0.4.5/bin/caribou.in 2012-12-18 20:18:57.280240349 +0530 @@ -24,6 +24,19 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +ARCH=$(uname -m) + +case $ARCH in +x86_64 | sparc64 | s390x | ppc64) +LIB_DIR=/usr/lib64 +SECONDARY_LIB_DIR=/usr/lib +;; +* ) +LIB_DIR=/usr/lib +SECONDARY_LIB_DIR=/usr/lib64 +;; +esac + script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ @@ -32,7 +45,7 @@ if [ $script_dir = "@bindir@" ] then export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" else export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" diff -urN caribou-0.4.5.orig/bin/caribou-preferences.in caribou-0.4.5/bin/caribou-preferences.in --- caribou-0.4.5.orig/bin/caribou-preferences.in 2012-11-20 23:11:25.000000000 +0530 +++ caribou-0.4.5/bin/caribou-preferences.in 2012-12-18 20:18:57.281240350 +0530 @@ -18,6 +18,19 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +ARCH=$(uname -m) + +case $ARCH in +x86_64 | sparc64 | s390x | ppc64) +LIB_DIR=/usr/lib64 +SECONDARY_LIB_DIR=/usr/lib +;; +* ) +LIB_DIR=/usr/lib +SECONDARY_LIB_DIR=/usr/lib64 +;; +esac + script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ @@ -27,8 +40,8 @@ then datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" - export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" + export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" + export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" else export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"