solenv/inc/installationtest.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0d957d1c10eeb6e0d15cc2fbc56239c1ec40fb6c
Author: Petr Mladek <pmla...@suse.cz>
Date: Mon Jan 7 18:51:08 2013 +0100
fix install test to work with "LibreOffice" installer name
Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index fcfb520..c9ed719 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -97,10 +97,10 @@ my_javaenv = \
.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" !=
"YES"
OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
$(MISC)/$(TARGET)/installation.flag : $(shell \
- ls
$(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip)
+ ls
$(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip)
$(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)unzip -q
$(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d
"$(OOO_EXTRACT_TO)"
- $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso)
"$(OOO_EXTRACT_TO)"/opt
+ $(COMMAND_ECHO)unzip -q
$(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip -d
"$(OOO_EXTRACT_TO)"
+ $(COMMAND_ECHO)mv
"$(OOO_EXTRACT_TO)"/LibreOffice_*_install-arc_$(defaultlangiso)
"$(OOO_EXTRACT_TO)"/opt
$(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
.END
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
