diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2011-05-03 18:58:35 -0700 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-05-05 15:29:06 -0400 |
| commit | 16723b585ad8892bb0b2dd3cc317b319a1b3558d (patch) | |
| tree | b51d1bc8c85752cb86a65bbaebdf9bd1d4a39f5f /bin | |
| parent | 99d4abf727b6d605b913b313ac37e63dd254d1b7 (diff) | |
| download | caribou-16723b585ad8892bb0b2dd3cc317b319a1b3558d.tar.gz | |
fixed the executables, again.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/antler-keyboard.in | 14 | ||||
| -rw-r--r-- | bin/caribou-preferences.in | 7 | ||||
| -rw-r--r-- | bin/caribou.in | 5 |
3 files changed, 18 insertions, 8 deletions
diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in index b42734c..adbb61d 100644 --- a/bin/antler-keyboard.in +++ b/bin/antler-keyboard.in @@ -20,16 +20,20 @@ script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -if [ $script_dir == "@prefix@@libexecdir@" ] +prefix=@prefix@ +exec_prefix=@exec_prefix@ + +if [ $script_dir == "@libexecdir@" ] then - export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages:${PYTHONPATH}" - export GI_TYPELIB_PATH="@prefix@@libdir@/girepository-1.0:${GI_TYPELIB_PATH}" - export LD_LIBRARY_PATH="@prefix@@libdir@:${LD_LIBRARY_PATH}" - export XDG_DATA_DIRS="@prefix@@datadir@:${XDG_DATA_DIRS}" + export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${PYTHONPATH}" + export GI_TYPELIB_PATH="@libdir@/girepository-1.0:${GI_TYPELIB_PATH}" + export LD_LIBRARY_PATH="@libdir@:${LD_LIBRARY_PATH}" + export XDG_DATA_DIRS="@datadir@:${XDG_DATA_DIRS}" else export PYTHONPATH="$(dirname $script_dir):${PYTHONPATH}" export GI_TYPELIB_PATH="$(dirname $script_dir)/licaribou:${GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="$(dirname $script_dir)/licaribou/.lib:${LD_LIBRARY_PATH}" + export ANTLER_THEME_PATH="$(dirname $script_dir)/data" fi @PYTHON@ -c " diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in index 13948c8..7c836b0 100644 --- a/bin/caribou-preferences.in +++ b/bin/caribou-preferences.in @@ -20,12 +20,15 @@ script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -if [ $script_dir == "@prefix@@libexecdir@" ] +prefix=@prefix@ +exec_prefix=@exec_prefix@ + +if [ $script_dir == "@bindir@" ] then export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages:${PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0:${GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@:${LD_LIBRARY_PATH}" - export XDG_DATA_DIRS="@prefix@@datadir@:${XDG_DATA_DIRS}" + export XDG_DATA_DIRS="@datadir@:${XDG_DATA_DIRS}" else export PYTHONPATH="$(dirname $script_dir):${PYTHONPATH}" export GI_TYPELIB_PATH="$(dirname $script_dir)/licaribou:${GI_TYPELIB_PATH}" diff --git a/bin/caribou.in b/bin/caribou.in index 7bebd0d..50bceac 100644 --- a/bin/caribou.in +++ b/bin/caribou.in @@ -26,7 +26,10 @@ script_dir="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -if [ $script_dir == "@prefix@/bin" ] +prefix=@prefix@ +exec_prefix=@exec_prefix@ + +if [ $script_dir == "@bindir@" ] then export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages:${PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0":${GI_TYPELIB_PATH} |