diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-31 10:41:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-08-31 10:41:07 +0300 |
| commit | b75e6efdd04fa1128dd2cef6e28b1ad172464143 (patch) | |
| tree | cafd5c5518057bfb6798da1590aad6d1a739447c /instsetoo_native | |
| parent | class ViewDescriptor is unused (diff) | |
| download | core-b75e6efdd04fa1128dd2cef6e28b1ad172464143.tar.gz core-b75e6efdd04fa1128dd2cef6e28b1ad172464143.zip | |
Check ENABLE_ONLINE_UPDATE_MAR in one more place
Change-Id: I76f5702aad9b57f3031bc35b5271a5dde8ed4f28
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)))' \ |