summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-03-20 22:44:08 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-03-20 22:44:08 -0400
commit9ab37e8c366fe803f29ae2f9b3a2a8c82da888e0 (patch)
treec5ccf5b3e1670881de6ec7930cb10431d60b5ad1
parent29d955685f26d3d0b7657ec5d5dbf9ecc6ca3c1a (diff)
Revert "automake: Don't fail the build if we can't setuid."
This reverts commit e7ad5cdcd2eb8a307ad9cf2efdfde76f2e83aeb7. If you ask for setuid install and that fails you didn't get what you asked for and we shouldn't just silently carry on. If installing weston somewhere in your home directory and don't want the setuid bit set, disable that at configure time.
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 672110a..048e58f 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