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 | 61db5ff9ae07b760c9f236438489d19dd7cbe075 (patch) | |
| tree | 28162f500044a20a4a18ee594fcbc4eafd31e798 | |
| parent | ba5d782421bf8bafc4cbb5f60b5b93267fdd4122 (diff) | |
DEV300 masterfix: #i10000#: new naming scheme for installation setsooo/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 56b94b542..5e1675959 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 |