summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-15 10:51:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-15 10:51:04 +0200
commitf99df8b7ac4cba88ba5f6aa5439605fcff2d1e3e (patch)
treee4704eaf9b2c2e7e4c6c485db2197fe8932d0e65
parent4b73d334a9c5d8ae1fe16b2cc04100b9f333595a (diff)
Fix for LibreOfficeDev naming scheme
Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b
-rw-r--r--instsetoo_native/CustomTarget_install.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index bb8af1964b0d..78ed0a12ac59 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -102,15 +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
- rmdir $(DEVINSTALLDIR)/LibreOffice_*_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
+ 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 \
+ 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
+ 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)))