From 388184507429ef932cfa6d725ea146063a69d934 Mon Sep 17 00:00:00 2001
From: Ruediger Timm <rt@openoffice.org>
Date: Wed, 21 Apr 2010 09:58:45 +0200
Subject: [PATCH] DEV300 masterfix: #i10000#: Some fixes for the new smoketest:
 solenv/inc/installationtest.mk used wrong variables (UPDMINOR is not set on
 RE master builds, use LAST_MINOR from minor.mk instead),
 smoketestoo_native/makefile.mk needed adaptions to new install set naming
 scheme.

---
 smoketestoo_native/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index b288c77181f5..8b497ddb4727 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -56,12 +56,12 @@ $(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw
 
 .IF "$(OS)" != "WNT"
 $(installationtest_instpath).flag : \
-        $(shell ls $(installationtest_instset)/OOo_*_install.tar.gz)
+        $(shell ls $(installationtest_instset)/OOo_*_install_*.tar.gz)
     $(RM) -r $(installationtest_instpath)
     $(MKDIRHIER) $(installationtest_instpath)
     cd $(installationtest_instpath) && \
-        $(GNUTAR) xfz $(installationtest_instset)/OOo_*_install.tar.gz
-    $(MV) $(installationtest_instpath)/OOo_*_install \
+        $(GNUTAR) xfz $(installationtest_instset)/OOo_*_install_*.tar.gz
+    $(MV) $(installationtest_instpath)/OOo_*_install_* \
         $(installationtest_instpath)/opt
     $(TOUCH) $@
 cpptest : $(installationtest_instpath).flag