mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivi-shell: use install paths in example config 

The example weston.ini file uses source and build
directory paths. Therefore, it is only useful when
used on the same system that is used to build Weston.

We can use install paths instead of build/source paths
to fix this problem.

v2 changes:
- use $(westondatadir) instead of $(datadir)

Reported-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Emre Ucan 2018-05-24 17:08:47 +02:00 committed by Daniel Stone
parent cf4113c629
commit 67546bed04
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -24,10 +24,8 @@ weston.ini : $(srcdir)/weston.ini.in
ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-e 's|@bindir[@]|$(bindir)|g' \ -e 's|@bindir[@]|$(bindir)|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|@westondatadir[@]|$(westondatadir)|g' \
$< > $@ $< > $@
all-local : weston.ini ivi-shell/weston.ini all-local : weston.ini ivi-shell/weston.ini

54
ivi-shell/weston.ini.in
View File

@ -19,20 +19,20 @@ application-layer-id=4000
transition-duration=300 transition-duration=300
background-image=@abs_top_srcdir@/data/background.png background-image=@westondatadir@/background.png
background-id=1001 background-id=1001
panel-image=@abs_top_srcdir@/data/panel.png panel-image=@westondatadir@/panel.png
panel-id=1002 panel-id=1002
surface-id-offset=10 surface-id-offset=10
tiling-image=@abs_top_srcdir@/data/tiling.png tiling-image=@westondatadir@/tiling.png
tiling-id=1003 tiling-id=1003
sidebyside-image=@abs_top_srcdir@/data/sidebyside.png sidebyside-image=@westondatadir@/sidebyside.png
sidebyside-id=1004 sidebyside-id=1004
fullscreen-image=@abs_top_srcdir@/data/fullscreen.png fullscreen-image=@westondatadir@/fullscreen.png
fullscreen-id=1005 fullscreen-id=1005
random-image=@abs_top_srcdir@/data/random.png random-image=@westondatadir@/random.png
random-id=1006 random-id=1006
home-image=@abs_top_srcdir@/data/home.png home-image=@westondatadir@/home.png
home-id=1007 home-id=1007
workspace-background-color=0x99000000 workspace-background-color=0x99000000
workspace-background-id=2001 workspace-background-id=2001
@ -43,59 +43,59 @@ path=weston-keyboard
[ivi-launcher] [ivi-launcher]
workspace-id=0 workspace-id=0
icon-id=4001 icon-id=4001
icon=@abs_top_srcdir@/data/icon_ivi_flower.png icon=@westondatadir@/icon_ivi_flower.png
path=@abs_top_builddir@/weston-flower path=@bindir@/weston-flower
[ivi-launcher] [ivi-launcher]
workspace-id=0 workspace-id=0
icon-id=4002 icon-id=4002
icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png icon=@westondatadir@/icon_ivi_clickdot.png
path=@abs_top_builddir@/weston-clickdot path=@bindir@/weston-clickdot
[ivi-launcher] [ivi-launcher]
workspace-id=1 workspace-id=1
icon-id=4003 icon-id=4003
icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png icon=@westondatadir@/icon_ivi_simple-egl.png
path=@abs_top_builddir@/weston-simple-egl path=@bindir@/weston-simple-egl
[ivi-launcher] [ivi-launcher]
workspace-id=1 workspace-id=1
icon-id=4004 icon-id=4004
icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png icon=@westondatadir@/icon_ivi_simple-shm.png
path=@abs_top_builddir@/weston-simple-shm path=@bindir@/weston-simple-shm
[ivi-launcher] [ivi-launcher]
workspace-id=2 workspace-id=2
icon-id=4005 icon-id=4005
icon=@abs_top_srcdir@/data/icon_ivi_smoke.png icon=@westondatadir@/icon_ivi_smoke.png
path=@abs_top_builddir@/weston-smoke path=@bindir@/weston-smoke
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4006 icon-id=4006
icon=@abs_top_srcdir@/data/icon_ivi_flower.png icon=@westondatadir@/icon_ivi_flower.png
path=@abs_top_builddir@/weston-flower path=@bindir@/weston-flower
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4007 icon-id=4007
icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png icon=@westondatadir@/icon_ivi_clickdot.png
path=@abs_top_builddir@/weston-clickdot path=@bindir@/weston-clickdot
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4008 icon-id=4008
icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png icon=@westondatadir@/icon_ivi_simple-egl.png
path=@abs_top_builddir@/weston-simple-egl path=@bindir@/weston-simple-egl
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4009 icon-id=4009
icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png icon=@westondatadir@/icon_ivi_simple-shm.png
path=@abs_top_builddir@/weston-simple-shm path=@bindir@/weston-simple-shm
[ivi-launcher] [ivi-launcher]
workspace-id=3 workspace-id=3
icon-id=4010 icon-id=4010
icon=@abs_top_srcdir@/data/icon_ivi_smoke.png icon=@westondatadir@/icon_ivi_smoke.png
path=@abs_top_builddir@/weston-smoke path=@bindir@/weston-smoke