summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2012-10-31 12:46:16 +0900
committerDaiki Ueno <ueno@unixuser.org>2012-12-30 14:20:16 +0900
commit86fdbc3e7cd3a5e8d03d94d30056740d3a805001 (patch)
tree05979e2709a649ed8a83d5b65a1b2d199725eb75
parenta6a4392594379f7fb3f35bc0982a03f6afec771e (diff)
downloadcaribou-86fdbc3e7cd3a5e8d03d94d30056740d3a805001.tar.gz
build: make sure to define $datarootdir in generated scripts
Some of automake standard directory variables are expanded using "${datarootdir}", which must be available at run-time. Define it at the beginning of the script templates. https://bugzilla.gnome.org/show_bug.cgi?id=687315
-rwxr-xr-xbin/antler-keyboard.in1
-rwxr-xr-xbin/caribou-preferences.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in
index b25956e..941cf91 100755
--- a/bin/antler-keyboard.in
+++ b/bin/antler-keyboard.in
@@ -22,6 +22,7 @@ script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
if [ $script_dir = "@libexecdir@" ]
then
diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in
index fbb6326..eaacf05 100755
--- a/bin/caribou-preferences.in
+++ b/bin/caribou-preferences.in
@@ -22,6 +22,7 @@ script_dir="$(dirname "$(readlink -f ${0})")"
prefix=@prefix@
exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
if [ $script_dir = "@bindir@" ]
then