[Libreoffice-commits] online.git: loolwsd/Makefile.am

Tor Lillqvist tml at collabora.com
Tue Mar 1 16:30:57 UTC 2016


 loolwsd/Makefile.am |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 78579b3e57536835ba802d6104f3529607d2c41b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 1 18:30:07 2016 +0200

    Don't pretend to support non-Linux here either

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index b14f1fd..37ca105 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -44,13 +44,8 @@ clean-cache:
 # installing.
 all-local: loolwsd loolbroker
 	if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
-	    if test `uname -s` = Linux; then \
-		sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
-		sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
-	    else \
-		sudo chown root loolbroker && sudo chmod u+s loolbroker; \
-		sudo chown root loolbroker && sudo chmod u+s loolkit; \
-	    fi; \
+	    sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
+	    sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
 	fi
 
 tags:


More information about the Libreoffice-commits mailing list