PR7062: base uprobes tree on s.runtime_path instead of PKGDATADIR

diff --git a/ChangeLog b/ChangeLog
index dff79be99ac66e76e2cb79f8715ee9b8d558cf3d..982f36a0099a7a7f344dafaf1a8637996ff7c2d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08  Frank Ch. Eigler  <fche@elastic.org>
+
+       PR7062
+       * buildrun.cxx (uprobes_home): Make local, based on
+       session.runtime_path.
+
 2008-12-05  Frank Ch. Eigler  <fche@elastic.org>
 
        * tapsets.cxx, translate.cxx: Set default elfutils debuginfo_path

diff --git a/buildrun.cxx b/buildrun.cxx
index 9078a03534dd8ded4deba3c230df48cb9fedf71c..ece9eda4949532b3d17d2bebcda62c74536b1a67 100644 (file)
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -172,8 +172,6 @@ compile_pass (systemtap_session& s)
   return rc;
 }
 
-static const string uprobes_home = string(PKGDATADIR "/runtime/uprobes");
-
 /*
  * If uprobes was built as part of the kernel build (either built-in
  * or as a module), the uprobes exports should show up in either
@@ -196,6 +194,7 @@ verify_uprobes_uptodate (systemtap_session& s)
         << "verifying that SystemTap's version of uprobes is up to date."
         << endl;
 
+  string uprobes_home = s.runtime_path + "/uprobes";
   string make_cmd = string("make -q -C ") + uprobes_home
     + string(" uprobes.ko");
   int rc = run_make_cmd(s, make_cmd);
@@ -215,6 +214,7 @@ make_uprobes (systemtap_session& s)
         << "(re)building SystemTap's version of uprobes."
         << endl;
 
+  string uprobes_home = s.runtime_path + "/uprobes";
   string make_cmd = string("make -C ") + uprobes_home;
   int rc = run_make_cmd(s, make_cmd);
   if (s.verbose > 1)
@@ -230,6 +230,7 @@ make_uprobes (systemtap_session& s)
 static int
 copy_uprobes_symbols (systemtap_session& s)
 {
+  string uprobes_home = s.runtime_path + "/uprobes";
   string cp_cmd = string("/bin/cp ") + uprobes_home +
     string("/Module.symvers ") + s.tmpdir;
   int rc = system (cp_cmd.c_str());