diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-07 18:51:08 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-07 18:54:32 +0100 |
| commit | 0d957d1c10eeb6e0d15cc2fbc56239c1ec40fb6c (patch) | |
| tree | 2a73456601dbbad4019926230e7aeffafcfa5402 /solenv/inc | |
| parent | 44cd995f02d2b46e5b0bfb3cbd743a366d4284f7 (diff) | |
fix install test to work with "LibreOffice" installer name
Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/installationtest.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index fcfb5202da99..c9ed71936adb 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 |