[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk

[Stephan Bergmann]

 instsetoo_native/CustomTarget_install.mk |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f99df8b7ac4cba88ba5f6aa5439605fcff2d1e3e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 15 10:51:04 2013 +0200

    Fix for LibreOfficeDev naming scheme
    
    Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index bb8af19..78ed0a1 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)))