|
leigh123linux |
a290dd |
diff -urN caribou-0.4.20.old/bin/antler-keyboard.in caribou-0.4.20/bin/antler-keyboard.in
|
|
leigh123linux |
a290dd |
--- caribou-0.4.20.old/bin/antler-keyboard.in 2016-06-27 19:40:02.959436627 +0530
|
|
leigh123linux |
a290dd |
+++ caribou-0.4.20/bin/antler-keyboard.in 2016-06-27 19:47:32.697767930 +0530
|
|
leigh123linux |
a290dd |
@@ -18,6 +18,19 @@
|
|
leigh123linux |
a290dd |
# along with this program; if not, write to the Free Software Foundation,
|
|
leigh123linux |
a290dd |
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
leigh123linux |
a290dd |
|
|
leigh123linux |
a290dd |
+ARCH=$(uname -m)
|
|
leigh123linux |
a290dd |
+
|
|
leigh123linux |
a290dd |
+case $ARCH in
|
|
leigh123linux |
a290dd |
+x86_64 | sparc64 | s390x | ppc64)
|
|
leigh123linux |
a290dd |
+LIB_DIR=/usr/lib64
|
|
leigh123linux |
a290dd |
+SECONDARY_LIB_DIR=/usr/lib
|
|
leigh123linux |
a290dd |
+;;
|
|
leigh123linux |
a290dd |
+* )
|
|
leigh123linux |
a290dd |
+LIB_DIR=/usr/lib
|
|
leigh123linux |
a290dd |
+SECONDARY_LIB_DIR=/usr/lib64
|
|
leigh123linux |
a290dd |
+;;
|
|
leigh123linux |
a290dd |
+esac
|
|
leigh123linux |
a290dd |
+
|
|
leigh123linux |
a290dd |
script_dir="$(dirname "$(readlink -f ${0})")"
|
|
leigh123linux |
a290dd |
|
|
leigh123linux |
a290dd |
prefix=@prefix@
|
|
leigh123linux |
a290dd |
@@ -28,8 +41,8 @@
|
|
leigh123linux |
a290dd |
then
|
|
leigh123linux |
a290dd |
datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
|
|
leigh123linux |
a290dd |
export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
|
|
leigh123linux |
a290dd |
- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
|
|
leigh123linux |
a290dd |
- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
|
leigh123linux |
a290dd |
+ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
|
|
leigh123linux |
a290dd |
+ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
|
leigh123linux |
a290dd |
export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
|
|
leigh123linux |
a290dd |
else
|
|
leigh123linux |
a290dd |
export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
|
|
leigh123linux |
a290dd |
diff -urN caribou-0.4.20.old/bin/caribou-preferences.in caribou-0.4.20/bin/caribou-preferences.in
|
|
leigh123linux |
a290dd |
--- caribou-0.4.20.old/bin/caribou-preferences.in 2016-06-27 19:40:02.959436627 +0530
|
|
leigh123linux |
a290dd |
+++ caribou-0.4.20/bin/caribou-preferences.in 2016-06-27 19:48:58.525983390 +0530
|
|
leigh123linux |
a290dd |
@@ -18,6 +18,19 @@
|
|
leigh123linux |
a290dd |
# along with this program; if not, write to the Free Software Foundation,
|
|
leigh123linux |
a290dd |
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
leigh123linux |
a290dd |
|
|
leigh123linux |
a290dd |
+ARCH=$(uname -m)
|
|
leigh123linux |
a290dd |
+
|
|
leigh123linux |
a290dd |
+case $ARCH in
|
|
leigh123linux |
a290dd |
+x86_64 | sparc64 | s390x | ppc64)
|
|
leigh123linux |
a290dd |
+LIB_DIR=/usr/lib64
|
|
leigh123linux |
a290dd |
+SECONDARY_LIB_DIR=/usr/lib
|
|
leigh123linux |
a290dd |
+;;
|
|
leigh123linux |
a290dd |
+* )
|
|
leigh123linux |
a290dd |
+LIB_DIR=/usr/lib
|
|
leigh123linux |
a290dd |
+SECONDARY_LIB_DIR=/usr/lib64
|
|
leigh123linux |
a290dd |
+;;
|
|
leigh123linux |
a290dd |
+esac
|
|
leigh123linux |
a290dd |
+
|
|
leigh123linux |
a290dd |
script_dir="$(dirname "$(readlink -f ${0})")"
|
|
leigh123linux |
a290dd |
|
|
leigh123linux |
a290dd |
prefix=@prefix@
|
|
leigh123linux |
a290dd |
@@ -28,8 +41,8 @@
|
|
leigh123linux |
a290dd |
then
|
|
leigh123linux |
a290dd |
datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
|
|
leigh123linux |
a290dd |
export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
|
|
leigh123linux |
a290dd |
- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
|
|
leigh123linux |
a290dd |
- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
|
leigh123linux |
a290dd |
+ export GI_TYPELIB_PATH="$LIB_DIR/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
|
|
leigh123linux |
a290dd |
+ export LD_LIBRARY_PATH="$LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
|
leigh123linux |
a290dd |
export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
|
|
leigh123linux |
a290dd |
else
|
|
leigh123linux |
a290dd |
export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
|