[Libreoffice-commits] .: solenv/inc

[Fridrich Strba]

 solenv/inc/installationtest.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f6f8092eb1df56b0d93fc458f2f6f866c60cd575
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Oct 21 17:44:32 2010 +0200

    Fix smoketests

diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 396d456..395257d 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -50,10 +50,10 @@ installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT)
 
 .IF "$(OS)" == "MACOSX"
 my_sofficepath = \
-    $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice
+    $(installationtest_instpath)/opt/LibreOffice.app/Contents/MacOS/soffice
 .ELIF "$(OS)" == "WNT"
 my_sofficepath = \
-    $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
+    $(installationtest_instpath)'/opt/LibreOffice 3/program/soffice.exe'
 .ELSE
 my_sofficepath = \
     $(installationtest_instpath)/opt/program/soffice
@@ -80,12 +80,12 @@ my_javaenv = \
 # smoketestoo_native:
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
 $(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
+        ls $(installationtest_instset)/Lib0_*_install-arc_$(defaultlangiso).zip)
     $(MKDIRHIER) $(@:d)
     my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
-    unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \
+    unzip $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip \
         -d "$$my_tmp" && \
-    mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
+    mv "$$my_tmp"/LibO_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
     echo "$$my_tmp" > $@
 .END