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