summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2017-05-24 17:35:45 +0200
committerAndras Timar <andras.timar@collabora.com>2017-06-15 10:59:24 +0200
commit517e3f8632d0301cc586dd7934203c01fb4ac62e (patch)
tree7403aedde9dec80c562d6e1712f8c5bff4b006e3
parent4702c321b33f57754af7a9eed4c872a7f0d97f13 (diff)
Let's always descent to loleaflet, and run make there.distro/collabora/collabora-online-2-0
It is so easy to forget :-( Change-Id: I8922a7a21a526ca92878efaf8555ccf27de8e462 Reviewed-on: https://gerrit.libreoffice.org/37993 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index d9d6fed40..e9b11ad82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,6 +213,7 @@ all-local: loolforkit @JAILS_PATH@ $(SYSTEM_STAMP)
else \
echo "Skipping capability setting"; \
fi
+ ( cd loleaflet && make )
# just run the build without any tests
build-nocheck: all-am