[Libreoffice-commits] .: smoketestoo_native/makefile.mk

[Caolán McNamara]

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

New commits:
commit 2842b13ff34a3c99327b9c6a4fcc3404f14e8e6c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 2 14:06:34 2010 +0000

    make smoketest use ooinstal to build its install set

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index a05065d..75ebd95 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -59,14 +59,9 @@ cpptest : $(SHL1TARGETN)
 OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw
 
 .IF "$(OS)" != "WNT"
-$(installationtest_instpath).flag : $(shell ls \
-        $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).tar.gz)
+localinstall :
     $(RM) -r $(installationtest_instpath)
     $(MKDIRHIER) $(installationtest_instpath)
-    cd $(installationtest_instpath) && $(GNUTAR) xfz \
-        $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).tar.gz
-    $(MV) $(installationtest_instpath)/LibO_*_install-arc_$(defaultlangiso) \
-        $(installationtest_instpath)/opt
-    $(TOUCH) $@
-cpptest : $(installationtest_instpath).flag
+    ooinstall $(installationtest_instpath)/opt
+cpptest : localinstall
 .END