Install desktop-shell in $prefix/libexec

dev
Kristian Høgsberg 13 years ago
parent d826404472
commit c4693c4ab4
  1. 11
      clients/Makefile.am
  2. 1
      compositor/Makefile.am
  3. 2
      compositor/shell.c

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

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

@ -963,7 +963,7 @@ desktop_shell_sigchld(struct wlsc_process *process, int status)
static int
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;
char s[32];
int sv[2], flags;

Loading…
Cancel
Save