[PATCH] build: do not install ivi-shell png files with "--disable-ivi-shell"

[Bryce Harrington]

On Mon, Feb 16, 2015 at 12:12:56PM +0200, Pekka Paalanen wrote:
> On Mon, 16 Feb 2015 11:00:36 +0100
> Manuel Bachmann <manuel.bachmann at open.eurogiciel.org> wrote:
> 
> > From: Manuel Bachmann <manuel.bachmann at open.eurogiciel.org>
> > 
> > Some of the .png files are specific to ivi-shell. Avoid installing
> > them to "$prefix/share/weston" if ivi-shell has explicitly been
> > disabled at configure time.
> > 
> > Signed-off-by: Manuel Bachmann <manuel.bachmann at open.eurogiciel.org>
> > ---
> >  Makefile.am |    6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 1864b70..32e8b0b 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -688,7 +688,10 @@ dist_westondata_DATA
> > =				\
> > data/icon_window.png			\
> > data/sign_close.png			\
> > data/sign_maximize.png			\
> > -	data/sign_minimize.png			\
> > +	data/sign_minimize.png
> > +
> > +if ENABLE_IVI_SHELL
> > +dist_westondata_DATA +=				\
> >  	data/background.png                     \
> >  	data/tiling.png                         \
> >  	data/fullscreen.png                     \
> > @@ -701,6 +704,7 @@ dist_westondata_DATA
> > =				\
> > data/icon_ivi_simple-egl.png            \
> > data/icon_ivi_simple-shm.png            \ data/icon_ivi_smoke.png
> > +endif
> >  
> >  
> >  if BUILD_WCAP_TOOLS
> 
> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Thanks, applied.
   8291979..d2c6892  master -> master

 
> 
> Thanks,
> pq
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel