mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell/weston.ini: fix paths

Browse Source 
If you do an out-of-tree build, all the images will be left in the
srcdir. Fix their paths.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Pekka Paalanen
2015-03-24 14:09:57 +02:00
parent f3a3453270
commit 8cb258766b
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+2
View File
@@ -23,6 +23,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
$(AM_V_GEN)$(SED) \ $(AM_V_GEN)$(SED) \
-e 's|@bindir[@]|$(bindir)|g' \ -e 's|@bindir[@]|$(bindir)|g' \
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@plugin_prefix[@]||g' \ -e 's|@plugin_prefix[@]||g' \
$< > $@ $< > $@
@@ -31,6 +32,7 @@ tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
$(AM_V_GEN)$(SED) \ $(AM_V_GEN)$(SED) \
-e 's|@bindir[@]|$(bindir)|g' \ -e 's|@bindir[@]|$(bindir)|g' \
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \ -e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \
$< > $@ $< > $@
ivi-shell/weston.ini.in
+17 -17
View File
@@ -17,19 +17,19 @@ application-layer-id=4000
transition-duration=300 transition-duration=300
background-image=@abs_top_builddir@/data/background.png background-image=@abs_top_srcdir@/data/background.png
background-id=1001 background-id=1001
panel-image=@abs_top_builddir@/data/panel.png panel-image=@abs_top_srcdir@/data/panel.png
panel-id=1002 panel-id=1002
tiling-image=@abs_top_builddir@/data/tiling.png tiling-image=@abs_top_srcdir@/data/tiling.png
tiling-id=1003 tiling-id=1003
sidebyside-image=@abs_top_builddir@/data/sidebyside.png sidebyside-image=@abs_top_srcdir@/data/sidebyside.png
sidebyside-id=1004 sidebyside-id=1004
fullscreen-image=@abs_top_builddir@/data/fullscreen.png fullscreen-image=@abs_top_srcdir@/data/fullscreen.png
fullscreen-id=1005 fullscreen-id=1005
random-image=@abs_top_builddir@/data/random.png random-image=@abs_top_srcdir@/data/random.png
random-id=1006 random-id=1006
home-image=@abs_top_builddir@/data/home.png home-image=@abs_top_srcdir@/data/home.png
home-id=1007 home-id=1007
workspace-background-color=0x99000000 workspace-background-color=0x99000000
workspace-background-id=2001 workspace-background-id=2001
@@ -40,59 +40,59 @@ path=@libexecdir@/weston-keyboard
[ivi-launcher] [ivi-launcher]
workspace-id=0 workspace-id=0
icon-id=4001 icon-id=4001
icon=@abs_top_builddir@/data/icon_ivi_flower.png icon=@abs_top_srcdir@/data/icon_ivi_flower.png
path=@abs_top_builddir@/weston-flower path=@abs_top_builddir@/weston-flower
[ivi-launcher] [ivi-launcher]
workspace-id=0 workspace-id=0
icon-id=4002 icon-id=4002
icon=@abs_top_builddir@/data/icon_ivi_clickdot.png icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
path=@abs_top_builddir@/weston-clickdot path=@abs_top_builddir@/weston-clickdot
[ivi-launcher] [ivi-launcher]
workspace-id=1 workspace-id=1
icon-id=4003 icon-id=4003
icon=@abs_top_builddir@/data/icon_ivi_simple-egl.png icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
path=@abs_top_builddir@/weston-simple-egl path=@abs_top_builddir@/weston-simple-egl
[ivi-launcher] [ivi-launcher]
workspace-id=1 workspace-id=1
icon-id=4004 icon-id=4004
icon=@abs_top_builddir@/data/icon_ivi_simple-shm.png icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
path=@abs_top_builddir@/weston-simple-shm path=@abs_top_builddir@/weston-simple-shm
[ivi-launcher] [ivi-launcher]
workspace-id=2 workspace-id=2
icon-id=4005 icon-id=4005
icon=@abs_top_builddir@/data/icon_ivi_smoke.png icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
path=@abs_top_builddir@/weston-smoke path=@abs_top_builddir@/weston-smoke
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4006 icon-id=4006
icon=@abs_top_builddir@/data/icon_ivi_flower.png icon=@abs_top_srcdir@/data/icon_ivi_flower.png
path=@abs_top_builddir@/weston-flower path=@abs_top_builddir@/weston-flower
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4007 icon-id=4007
icon=@abs_top_builddir@/data/icon_ivi_clickdot.png icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
path=@abs_top_builddir@/weston-clickdot path=@abs_top_builddir@/weston-clickdot
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4008 icon-id=4008
icon=@abs_top_builddir@/data/icon_ivi_simple-egl.png icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
path=@abs_top_builddir@/weston-simple-egl path=@abs_top_builddir@/weston-simple-egl
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4009 icon-id=4009
icon=@abs_top_builddir@/data/icon_ivi_simple-shm.png icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
path=@abs_top_builddir@/weston-simple-shm path=@abs_top_builddir@/weston-simple-shm
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4010 icon-id=4010
icon=@abs_top_builddir@/data/icon_ivi_smoke.png icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
path=@abs_top_builddir@/weston-smoke path=@abs_top_builddir@/weston-smoke