diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-21 18:35:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-21 18:35:51 +0200 |
| commit | a0de0def4a49a63c6675a622123b793da8b4c78d (patch) | |
| tree | f00da93cd099a7ce6cbe1c4d601726a678f267f1 | |
| parent | 46fd3a60f3b222c623280ace5644c3373f5ca576 (diff) | |
DEV300 masterfix: #i10000#: new naming scheme for installation sets
Notes
split repo tag: bootstrap_ooo/DEV300_m77
| -rw-r--r-- | solenv/inc/installationtest.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 56b94b542c71..5e16759592cd 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -71,12 +71,13 @@ my_javaenv = \ # on other platforms, a single installation to solver is created in # smoketestoo_native: .IF "$(OS)" == "WNT" -$(MISC)/$(TARGET)/installation.flag : \ - $(shell ls $(installationtest_instset)/OOo_*_install.zip) +$(MISC)/$(TARGET)/installation.flag : $(shell \ + ls $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip) $(MKDIRHIER) $(@:d) my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \ - unzip $(installationtest_instset)/OOo_*_install.zip -d "$$my_tmp" && \ - mv "$$my_tmp"/OOo_*_install "$$my_tmp"/opt && \ + unzip $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip \ + -d "$$my_tmp" && \ + mv "$$my_tmp"/OOo_*_install_$(defaultlangiso) "$$my_tmp"/opt && \ echo "$$my_tmp" > $@ .END |