osdmenu: Tweak config file for installed system

And not for in-tree running

Close: #5111

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

diff --git a/share/Makefile.am b/share/Makefile.am
index f062f02244b3d0e5b8105d4758f47946b4f23487..f7b64cb4d9d19a8f3c509e1c05c7ec078bdeb19f 100644 (file)
--- 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 092c86cbc4f577e342c36f9e74df4dbde513103d..66a58a41e878e558f699ddebaa935c827eeb402f 100644 (file)
--- 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