[Libreoffice-commits] core.git: Makefile.in

Stephan Bergmann sbergman at redhat.com
Tue Feb 20 08:33:13 UTC 2018


 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7536acb3b608c0aa5ae79491e9a4e708862c543d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 20 09:32:08 2018 +0100

    Fix test
    
    ...broken with 60f1490af9b29ac2df8e9e9411e9d41b472f9113 "Buildsystem changes to
    recognize Haiku."
    
    Change-Id: If08a0ca2e4c4809b832c69d999ff075ad56829af

diff --git a/Makefile.in b/Makefile.in
index 3fb86acf4dc1..470c6956cc0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
 all: build
 
 check-if-root:
-	@if test ! `uname` = 'Haiku' && `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
+	@if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
 		echo; \
 		echo 'No. You make ME a sandwich.'; \
 		echo; \


More information about the Libreoffice-commits mailing list