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

Install desktop-shell in $prefix/libexec

This commit is contained in:
Kristian Høgsberg 2011-11-14 14:57:17 -05:00
parent d826404472
commit c4693c4ab4
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clients/Makefile.am
View File

@ -2,6 +2,8 @@ noinst_PROGRAMS = $(clients_programs) \
$(poppler_programs) \ $(poppler_programs) \
$(simple_clients_programs) $(simple_clients_programs)
libexec_PROGRAMS = $(desktop_shell)
if BUILD_SIMPLE_CLIENTS if BUILD_SIMPLE_CLIENTS
simple_clients_programs = simple-egl simple-shm simple_clients_programs = simple-egl simple-shm
simple_egl_SOURCES = simple-egl.c simple_egl_SOURCES = simple-egl.c
@ -21,8 +23,9 @@ clients_programs = \
dnd \ dnd \
smoke \ smoke \
resizor \ resizor \
eventdemo \ eventdemo
desktop-shell
desktop_shell = wayland-desktop-shell
noinst_LIBRARIES = libtoytoolkit.a noinst_LIBRARIES = libtoytoolkit.a
@ -68,11 +71,11 @@ resizor_LDADD = $(toolkit_libs)
eventdemo_SOURCES = eventdemo.c eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = $(toolkit_libs) eventdemo_LDADD = $(toolkit_libs)
desktop_shell_SOURCES = \ wayland_desktop_shell_SOURCES = \
desktop-shell.c \ desktop-shell.c \
desktop-shell-client-protocol.h \ desktop-shell-client-protocol.h \
desktop-shell-protocol.c desktop-shell-protocol.c
desktop_shell_LDADD = $(toolkit_libs) wayland_desktop_shell_LDADD = $(toolkit_libs)
BUILT_SOURCES = \ BUILT_SOURCES = \
screenshooter-client-protocol.h \ screenshooter-client-protocol.h \

1
compositor/Makefile.am
View File

@ -3,6 +3,7 @@ bin_PROGRAMS = wayland-compositor
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \
-DXSERVER_PATH='"@XSERVER_PATH@"' \ -DXSERVER_PATH='"@XSERVER_PATH@"' \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)

2
compositor/shell.c
View File

@ -963,7 +963,7 @@ desktop_shell_sigchld(struct wlsc_process *process, int status)
static int static int
launch_desktop_shell_process(struct wl_shell *shell) launch_desktop_shell_process(struct wl_shell *shell)
{ {
const char *shell_exe = "./clients/desktop-shell"; const char *shell_exe = LIBEXECDIR "/wayland-desktop-shell";
struct wlsc_compositor *compositor = shell->compositor; struct wlsc_compositor *compositor = shell->compositor;
char s[32]; char s[32];
int sv[2], flags; int sv[2], flags;