summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-01 17:39:52 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-01 18:03:36 +0200
commitb81f49ce0f3ebf8ff7ed583ba99f31f7c1d49b95 (patch)
treeea94464f3a1e2d21926e86f045b28cb7ad9b2994 /instsetoo_native
parentf1d0889058c112c5a594755be7f3482ced2da395 (diff)
test-install: get rid of opt/
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/CustomTarget_install.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 7936e352a94e..ba9fc4bac7da 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -98,13 +98,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,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
+ mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
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/
+ $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif