diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 13:18:04 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 19:59:18 +0000 |
| commit | ac5f2f3481a318cadd7c59e7ea89401f81e9a259 (patch) | |
| tree | 1919c6231508bac01e26c1353b8b3ab761f8b82f /instsetoo_native | |
| parent | d5d721a130df631f1cf46ac636ba22314f539f6b (diff) | |
ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e
Reviewed-on: https://gerrit.libreoffice.org/5703
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 5045b5ae9717..0aeb5f7c9c08 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -79,7 +79,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \ + -p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ -u $(instsetoo_OUT) \ -buildid $(LIBO_VERSION_PATCH) \ $(if $(filter WNT,$(OS)), \ @@ -97,12 +97,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_DEV_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt rmdir $(DEVINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(DEVINSTALLDIR)/opt/ rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK |