instsetoo_native/CustomTarget_setup.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b75e6efdd04fa1128dd2cef6e28b1ad172464143
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Aug 31 10:41:07 2017 +0300
Check ENABLE_ONLINE_UPDATE_MAR in one more place
Change-Id: I76f5702aad9b57f3031bc35b5271a5dde8ed4f28
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 2b312be018cf..ee90c17c31c0 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -156,7 +156,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'BuildVersion=$(BUILD_VER_STRING)' \
&& echo 'buildid=$(shell cd $(SRCDIR) && git log -1
--format=%H)' \
&& echo
'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
\
- && echo 'UpdateChannel=$(shell cd $(SRCDIR) &&
bin/update/get_update_channel.py $(UPDATE_CONFIG))' \
+ && echo 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell
cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))' \
&& echo 'ReferenceOOoMajorMinor=4.1' \
&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
&& echo 'UpdateURL=$(if
$(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
