summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--instsetoo_native/CustomTarget_install.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index ca3f2def3f3c..bb8af1964b0d 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -102,8 +102,15 @@ $(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
- mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
+ unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice_*_archive.zip
+ mv $(DEVINSTALLDIR)/LibreOffice_*_archive/* $(DEVINSTALLDIR)/opt
+ rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive
+ $(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
+ mv $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK/sdk \
+ $(DEVINSTALLDIR)/opt/
+ rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK
+ rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk
else # LIBO_DEV_INSTALL
$(call instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))