[Libreoffice-commits] .: Makefile.am

[Thorsten Behrens]

 Makefile.am |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a2f1f5eb25f3a30f15b2d4a196882feece692252
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Nov 23 18:42:17 2010 +0100

    Make smoketest make target work again

diff --git a/Makefile.am b/Makefile.am
index 2cfa1af..4a756f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,10 +164,11 @@ $(BUILDDIR)/install/program/ooenv: $(STAMP_DIR)/build
 	@echo "links to the build tree into $(BUILDDIR)/install."
 
 # Run smoketest, but timeout in 15 minutes if it got stuck
-smoketest: $(BUILDDIR)/install/program/ooenv
-	( . $(OOBUILDDIR)/*.Set.sh ; export SAL_USE_VCLPLUGIN="svp" ; \
+smoketest: $(STAMP_DIR)/build
+	( . $(OOBUILDDIR)/*.Set.sh ; export SAL_USE_VCLPLUGIN="svp" ; export EPM=yes ; export PKGFORMAT=archive ; \
 	  cd $(OOBUILDDIR)/test && build.pl && deliver.pl && \
-	  cd $(OOBUILDDIR)/smoketestoo_native && \
+	  cd $(OOBUILDDIR)/instsetoo_native && build.pl && deliver.pl && \
+	  cd $(OOBUILDDIR)/smoketestoo_native && build.pl && deliver.pl && \
 	  $(TOOLSDIR)/bin/timeout3 -t $$((15*60)) build.pl )
 
 id : $(OOBUILDDIR)/ID