summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-01 23:48:56 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-02 10:58:59 +0200
commit0d3c536d0535fb7d50c123dd8b9d3fdf5d5dc973 (patch)
tree6e8c716f2f6b1c7c3129d81a32cfc269e0587203 /instsetoo_native
parenta323a7df85c6b782cdbd2a35ba0498ceeeb40dec (diff)
fix make test-install on WNT
Change-Id: I681f2c4989b88943fe57e6173554a019539a18cc
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/CustomTarget_install.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index ba9fc4bac7da..04e78d4eecc3 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -98,7 +98,8 @@ $(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)/
+ mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/
+ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)