diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 15:30:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 18:03:36 +0200 |
| commit | f1d0889058c112c5a594755be7f3482ced2da395 (patch) | |
| tree | 0b995cccb8e57add808376fe237948d0ed217354 /instsetoo_native | |
| parent | be59288ff46a7f3462f5d055f06edacc59340c36 (diff) | |
put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.
Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 0aeb5f7c9c08..7936e352a94e 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -95,20 +95,20 @@ endef $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) rm -rf $(instsetoo_OUT) -ifeq (TRUE,$(LIBO_DEV_INSTALL)) +ifeq (TRUE,$(LIBO_TEST_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - 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 + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/opt + rmdir $(TESTINSTALLDIR)/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 $(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 - rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ + $(TESTINSTALLDIR)/opt/ + rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK + rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk endif -else # LIBO_DEV_INSTALL +else # LIBO_TEST_INSTALL $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT)) @@ -124,6 +124,6 @@ ifneq (WNT,$(OS)) $(foreach lang,$(instsetoo_native_WITH_LANG),\ $(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT))) endif -endif # LIBO_DEV_INSTALL +endif # LIBO_TEST_INSTALL # vim: set noet sw=4 ts=4: |