Commit f2b874d5 authored by Benjamin Drung's avatar Benjamin Drung Committed by Christophe Mutricy

osdmenu: Tweak config file for installed system

And not for in-tree running

Close: #5111
Signed-off-by: default avatarChristophe Mutricy <xtophe@chewa.net>
parent 546bfa6b
...@@ -47,9 +47,11 @@ EXTRA_DIST += \ ...@@ -47,9 +47,11 @@ EXTRA_DIST += \
$(DIST_skins2) \ $(DIST_skins2) \
$(DIST_http_lua) \ $(DIST_http_lua) \
$(DIST_lua) \ $(DIST_lua) \
osdmenu/default.cfg.in \
$(DIST_osdmenu_default) \ $(DIST_osdmenu_default) \
$(DIST_maemo) \ $(DIST_maemo) \
$(DIST_solid) $(DIST_solid)
CLEANFILES += osdmenu/default.cfg
nobase_vlcdata_DATA = nobase_vlcdata_DATA =
if BUILD_SKINS if BUILD_SKINS
...@@ -58,6 +60,7 @@ nobase_vlcdata_DATA += $(DIST_skins2) ...@@ -58,6 +60,7 @@ nobase_vlcdata_DATA += $(DIST_skins2)
endif endif
if BUILD_OSDMENU if BUILD_OSDMENU
nobase_vlcdata_DATA += \ nobase_vlcdata_DATA += \
osdmenu/default.cfg \
$(DIST_osdmenu_default) $(DIST_osdmenu_default)
endif endif
if BUILD_HILDON if BUILD_HILDON
...@@ -67,6 +70,10 @@ if KDE_SOLID ...@@ -67,6 +70,10 @@ if KDE_SOLID
soliddata_DATA = $(DIST_solid) soliddata_DATA = $(DIST_solid)
endif 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 = \ DIST_rsrc = \
newres.h \ newres.h \
resource.h \ resource.h \
...@@ -98,7 +105,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES) ...@@ -98,7 +105,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
tar cvv --exclude .svn --no-recursion --null -T -) | \ tar cvv --exclude .svn --no-recursion --null -T -) | \
gzip -n > skins2/default.vlt gzip -n > skins2/default.vlt
DIST_osdmenu_default = \ DIST_osdmenu_default = \
osdmenu/default.cfg \
osdmenu/default/unselected.png \ osdmenu/default/unselected.png \
osdmenu/default/selection/bw.png \ osdmenu/default/selection/bw.png \
osdmenu/default/selection/esc.png \ osdmenu/default/selection/esc.png \
......
dir share/osdmenu/default dir @vlcdatadir@/osdmenu/default
action key-play-pause (0,0) action key-play-pause (0,0)
unselect unselected.png unselect unselected.png
select selection/play_pause.png select selection/play_pause.png
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment