[ontv] gconf keybindings has no longer hardcoded value for ontv executable
- From: Olof Kindgren <olki src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ontv] gconf keybindings has no longer hardcoded value for ontv executable
- Date: Wed, 24 Feb 2010 20:50:17 +0000 (UTC)
commit a3715f40064266619ef7e1945440b2197c71a958
Author: Olof Kindgren <olki src gnome org>
Date: Tue Feb 23 20:45:25 2010 +0100
gconf keybindings has no longer hardcoded value for ontv executable
A new makefile rule translates @LIBEXECDIR This also means that
ontv.schemas.in is replaced with ontv.schemas.in.in
data/Makefile.am | 4 ++++
data/{ontv.schemas.in => ontv.schemas.in.in} | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 638612d..4e3df0f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,6 +24,10 @@ glade_DATA = ontv.ui
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = GNOME_OnTVApplet.xml
+$(schema_in_files): $(schema_in_files:.schemas.in=.schemas.in.in)
+ sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" < $< > $@
+
+
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = ontv.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
diff --git a/data/ontv.schemas.in b/data/ontv.schemas.in.in
similarity index 98%
rename from data/ontv.schemas.in
rename to data/ontv.schemas.in.in
index 1bdb103..fdd7c58 100644
--- a/data/ontv.schemas.in
+++ b/data/ontv.schemas.in.in
@@ -38,7 +38,7 @@
<applyto>/desktop/gnome/keybindings/toggle_window_hotkey/action</applyto>
<owner>ontv</owner>
<type>string</type>
- <default>/usr/libexec/ontv -wt</default>
+ <default>@LIBEXECDIR@/ontv -wt</default>
<locale name="C">
<short>Toggle program window action</short>
<long>Command for toggling visibility of the OnTV program window.</long>
@@ -71,7 +71,7 @@
<applyto>/desktop/gnome/keybindings/show_search_program_hotkey/action</applyto>
<owner>ontv</owner>
<type>string</type>
- <default>/usr/libexec/ontv -ws</default>
+ <default>@LIBEXECDIR@/ontv -ws</default>
<locale name="C">
<short>Show search program action</short>
<long>Command for showing the search program window.</long>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]