diff -urN caribou-0.4.1.old/bin/antler-keyboard.in caribou-0.4.1/bin/antler-keyboard.in
--- caribou-0.4.1.old/bin/antler-keyboard.in 2011-10-10 02:08:14.000000000 +0530
+++ caribou-0.4.1/bin/antler-keyboard.in 2011-12-06 15:32:55.517736521 +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 ${BASH_SOURCE[0]})")"
prefix=@prefix@
@@ -27,9 +40,9 @@
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 XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
+ 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="$LIB_DIR${datadir:+:$datadir}"
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.1.old/bin/caribou.in caribou-0.4.1/bin/caribou.in
--- caribou-0.4.1.old/bin/caribou.in 2011-10-10 02:08:14.000000000 +0530
+++ caribou-0.4.1/bin/caribou.in 2011-12-06 15:37:16.757085822 +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 ${BASH_SOURCE[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.1.old/bin/caribou-preferences.in caribou-0.4.1/bin/caribou-preferences.in
--- caribou-0.4.1.old/bin/caribou-preferences.in 2011-10-10 02:08:14.000000000 +0530
+++ caribou-0.4.1/bin/caribou-preferences.in 2011-12-06 15:37:44.754230253 +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 ${BASH_SOURCE[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}"