From 86fdbc3e7cd3a5e8d03d94d30056740d3a805001 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 31 Oct 2012 12:46:16 +0900 Subject: 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 --- bin/antler-keyboard.in | 1 + bin/caribou-preferences.in | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.1