diff options
| author | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
| commit | c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b (patch) | |
| tree | ab2388afb795ed1a7ead2fbbf8b9d1b368a8231f /run-stap.in | |
| parent | dd9a3bcbef65bde65491d959e9458bc641924811 (diff) | |
| parent | 3863e7999255deeaa7f8f4bba7df893773812537 (diff) | |
| download | systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.gz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.xz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.zip | |
Merge commit 'origin/master' into pr7043
Conflicts:
runtime/print.c
runtime/transport/transport.c
runtime/transport/transport_msgs.h
Diffstat (limited to 'run-stap.in')
| -rw-r--r-- | run-stap.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/run-stap.in b/run-stap.in index dfb53ab2..8b150ece 100644 --- a/run-stap.in +++ b/run-stap.in @@ -19,11 +19,8 @@ esac # Set all the variables to find the source and build trees. SYSTEMTAP_TAPSET="${srcdir}/tapset" SYSTEMTAP_RUNTIME="${srcdir}/runtime" -SYSTEMTAP_STAPIO="${builddir}/stapio" -SYSTEMTAP_STAPRUN="sudo 'SYSTEMTAP_STAPIO=$SYSTEMTAP_STAPIO' \ - 'SYSTEMTAP_STAPRUN=${builddir}/staprun' \ - ${builddir}/staprun" -export SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_STAPRUN SYSTEMTAP_STAPIO +SYSTEMTAP_STAPRUN="${builddir}/run-staprun" +export SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_STAPRUN # If there were private elfutils libs built, use them. if [ -d "$rundir/lib-elfutils" ]; then |