[PATCH] weston: Change path for default terminal launcher to ${prefix}/bin

[Kristian Hoegsberg]

On Wed, Feb 29, 2012 at 05:31:03PM +0100, Rodney Lorrimar wrote:
> If you don't have anything at ~/.config/weston-desktop-shell.ini and
> have weston installed somewhere other than /usr, then this patch will
> help.

Thanks, that's better.
Kristian

> Cheers,
> 
> Signed-off-by: Rodney Lorrimar <rodney at rodney.id.au>
> ---
>  clients/Makefile.am     |    1 +
>  clients/desktop-shell.c |    2 +-
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/clients/Makefile.am b/clients/Makefile.am
> index b64c38a..d7a6cbf 100644
> --- a/clients/Makefile.am
> +++ b/clients/Makefile.am
> @@ -48,6 +48,7 @@ noinst_LIBRARIES = libtoytoolkit.a
>  AM_CFLAGS = $(GCC_CFLAGS)
>  AM_CPPFLAGS =					\
>  	-DDATADIR='"$(datadir)"'		\
> +	-DBINDIR='"$(bindir)"'			\
>  	$(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS)
>  
>  libtoytoolkit_a_SOURCES =			\
> diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
> index db41568..a181e3b 100644
> --- a/clients/desktop-shell.c
> +++ b/clients/desktop-shell.c
> @@ -698,7 +698,7 @@ add_default_launcher(struct desktop *desktop)
>  	wl_list_for_each(output, &desktop->outputs, link)
>  		panel_add_launcher(output->panel,
>  				   DATADIR "/weston/terminal.png",
> -				   "/usr/bin/weston-terminal");
> +				   BINDIR "/weston-terminal");
>  }
>  
>  int main(int argc, char *argv[])
> -- 
> 1.7.9.1
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel