Commits

Anonymous committed bdd7759

DEV300 masterfix: #i10000#: new naming scheme for installation sets

Comments (0)

Files changed (1)

solenv/inc/installationtest.mk

 # 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