[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - Repository.mk
Rene Engelhard (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 4 18:40:23 UTC 2021
Repository.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e4a55135042a734367ad98ff2e92f877f0959247
Author: Rene Engelhard <rene at debian.org>
AuthorDate: Thu Jul 29 12:58:32 2021 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 4 20:39:48 2021 +0200
fix install with --disable-cmis
Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119626
(cherry picked from commit e5dd63f1904582fe40f848675bc23630d24e9334)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119867
Reviewed-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 218a4417f96e..0f3d2458a867 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ucpexpand1 \
ucpext \
ucpimage \
- ucpcmis1 \
+ $(if $(ENABLE_LIBCMIS),ucpcmis1) \
ucptdoc1 \
unordf \
unoxml \
More information about the Libreoffice-commits
mailing list