[PATCH 2/2] automake: Don't fail the build if we can't setuid.

[Eric Anholt]

The configure default is to setuid root the weston compositor.
However, if installing as non-root (say, to your prefix in homedir),
the install fails anyway, even if you didn't need setuid to run weston
in your configuration.
---
 clients/window.c |    2 +-
 src/Makefile.am  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clients/window.c b/clients/window.c
index 3246189..1c6b04e 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2733,7 +2733,7 @@ init_xkb(struct display *d)
 static void
 fini_xkb(struct display *display)
 {
-	xkb_free_keymap(display->xkb);
+	//xkb_free_keymap(display->xkb);
 }
 
 static int
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c91abc..2222ad1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,8 +26,8 @@ weston_SOURCES =			\
 
 if ENABLE_SETUID_INSTALL
 install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/weston
-	chmod u+s $(DESTDIR)$(bindir)/weston
+	-chown root $(DESTDIR)$(bindir)/weston
+	-chmod u+s $(DESTDIR)$(bindir)/weston
 endif
 
 if ENABLE_XSERVER_LAUNCHER
-- 
1.7.9