Kaydet (Commit) 0d957d1c authored tarafından Petr Mladek's avatar Petr Mladek

fix install test to work with "LibreOffice" installer name

Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb
üst 44cd995f
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment