Makefile.in | 8 ++++----
instsetoo_native/CustomTarget_install.mk | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 0d3c536d0535fb7d50c123dd8b9d3fdf5d5dc973
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Oct 1 23:48:56 2013 +0200
fix make test-install on WNT
Change-Id: I681f2c4989b88943fe57e6173554a019539a18cc
diff --git a/Makefile.in b/Makefile.in
index 450d674..050e7a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,14 +299,14 @@ endif
@echo "If you want to edit the .ui files with glade first execute:"
@echo
@echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade"
-ifeq ($(OS),LINUX)
+ifneq ($(OS),MACOSX)
@echo
@echo "Test installation finished, you can now execute:"
@echo
- @echo "$(TESTINSTALLDIR)/program/soffice"
-else ifeq ($(OS),MACOSX)
+ @echo " $(TESTINSTALLDIR)/program/soffice"
+else
@echo
- @echo "Developer installation finished, you can now run:"
+ @echo "Test installation finished, you can now run:"
@echo
@echo " open $(TESTINSTALLDIR)/LibreOffice.app"
@echo
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index ba9fc4b..04e78d4 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
