[vlc-commits] osdmenu: Tweak config file for installed system

[Benjamin Drung]

vlc/vlc-2.0 | branch: master | Benjamin Drung <bdrung at debian.org> | Sun Feb 12 18:35:53 2012 +0000| [3e6ea2c9e3beb7f0363117c19b57c42f587dd286] | committer: Jean-Baptiste Kempf

osdmenu: Tweak config file for installed system

And not for in-tree running

Close: #5111

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
(cherry picked from commit f2b874d502441235b2fe6f36147ac3d91d1adec2)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3e6ea2c9e3beb7f0363117c19b57c42f587dd286
---

 share/Makefile.am                             |    8 +++++++-
 share/osdmenu/{default.cfg => default.cfg.in} |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index f062f02..f7b64cb 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -47,9 +47,11 @@ EXTRA_DIST += \
 	$(DIST_skins2) \
 	$(DIST_http_lua) \
 	$(DIST_lua) \
+	osdmenu/default.cfg.in \
 	$(DIST_osdmenu_default) \
 	$(DIST_maemo) \
 	$(DIST_solid)
+CLEANFILES += osdmenu/default.cfg
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
@@ -58,6 +60,7 @@ nobase_vlcdata_DATA += $(DIST_skins2)
 endif
 if BUILD_OSDMENU
 nobase_vlcdata_DATA += \
+	osdmenu/default.cfg \
 	$(DIST_osdmenu_default)
 endif
 if BUILD_HILDON
@@ -67,6 +70,10 @@ if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
 endif
 
+osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status
+	$(AM_V_GEN)mkdir -p osdmenu; \
+	  	   sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@
+
 DIST_rsrc = \
 	newres.h \
 	resource.h \
@@ -98,7 +105,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
 		tar cvv --exclude .svn --no-recursion --null -T -) | \
 	gzip -n > skins2/default.vlt
 DIST_osdmenu_default = \
-	osdmenu/default.cfg \
 	osdmenu/default/unselected.png \
 	osdmenu/default/selection/bw.png \
 	osdmenu/default/selection/esc.png \
diff --git a/share/osdmenu/default.cfg b/share/osdmenu/default.cfg.in
similarity index 97%
rename from share/osdmenu/default.cfg
rename to share/osdmenu/default.cfg.in
index 092c86c..66a58a4 100644
--- a/share/osdmenu/default.cfg
+++ b/share/osdmenu/default.cfg.in
@@ -1,4 +1,4 @@
-dir share/osdmenu/default
+dir @vlcdatadir@/osdmenu/default
 action	key-play-pause (0,0)
 	unselect unselected.png
 	select   selection/play_pause.png