From 961588fd58020a7c21e4a9c0c50bc5a5f26e4790 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 18 Dec 2009 16:22:01 -0500
Subject: PR 10247 10276 10905: Infrastructure for moving underlying
 client/server tools to libexec.

---
 stap-start-server | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'stap-start-server')

diff --git a/stap-start-server b/stap-start-server
index ab78fc09..56893dc2 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -13,7 +13,8 @@
 # process id, if successful.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
+
 startup_timeout=20
 
 # start the server
-- 
cgit 


From edecda6cff1304fca4c47034b7064dcd51bcc33d Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Mon, 21 Dec 2009 11:26:05 -0500
Subject: PR 10247, 10276, 10905: Move remaining client/server tools to
 libexec.

---
 stap-start-server | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'stap-start-server')

diff --git a/stap-start-server b/stap-start-server
index 56893dc2..1225902d 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -18,7 +18,7 @@
 startup_timeout=20
 
 # start the server
-${stap_exec_prefix}stap-serverd "$@" </dev/null >/dev/null 2>&1 &
+${stap_pkglibexecdir}stap-serverd "$@" </dev/null >/dev/null 2>&1 &
 server_pid=$!
 
 # Make sure the server is started
@@ -57,7 +57,7 @@ done
 echo -n "Unable to start a systemtap server: " >&2
 
 if test $server_started = 0; then
-    echo "${stap_exec_prefix}stap-serverd did not start" >&2
+    echo "${stap_pkglibexecdir}stap-serverd did not start" >&2
 elif test $avahi_advertising = 0; then
     echo "avahi is not advertising the server" >&2
 elif test $server_listening = 0; then
@@ -65,6 +65,6 @@ elif test $server_listening = 0; then
 fi
 
 # If the server partially started, then kill it.
-test $server_started = 1 && ${stap_exec_prefix}stap-stop-server $server_pid
+test $server_started = 1 && ${stap_pkglibexecdir}stap-stop-server $server_pid
 
 exit 1 # server did not start
-- 
cgit