From d5658775da9fa0ac792eb3f874df9f7c4d60de7e Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 8 Aug 2008 15:11:36 -0400
Subject: Start/stop the systemtap server from systemtap.exp and not in the top
 level Makefile.

---
 testsuite/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'testsuite/Makefile.am')

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 03c70cb6..6daef3f6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -13,7 +13,7 @@ clean-local:
 
 DEJAZILLA=@dejazilla@
 
-TOOL_OPTS=$(EXTRA_TOOL_OPTS)
+TOOL_OPTS=
 
 # automake's dejagnu library already runs check-DEJAGNU before check-local
 # That's why we need to add "execrc" to $(RUNTEST) - to ensure that this
@@ -40,7 +40,7 @@ SYSTEMTAP_RUNTIME=$(DESTDIR)$(pkgdatadir)/runtime
 SYSTEMTAP_TAPSET=$(DESTDIR)$(pkgdatadir)/tapset
 LD_LIBRARY_PATH=$(DESTDIR)$(libdir)/systemtap
 CRASH_LIBDIR=$(DESTDIR)$(libdir)/systemtap
-SYSTEMTAP_PATH=$(EXTRA_SYSTEMTAP_PATH):$(DESTDIR)$(bindir)
+SYSTEMTAP_PATH=$(DESTDIR)$(bindir)
 
 RUNTESTDEFAULTFLAGS = --tool $$tool --tool_opts \'$(TOOL_OPTS)\' --srcdir $$srcdir
 EXPECT = expect
-- 
cgit