diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-12-08 10:06:29 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-12-08 10:08:30 -0500 |
| commit | b0a34eab9633267e2a2da6e4b2b984725e68d158 (patch) | |
| tree | f31cc659dc2a8a9d05637f65a53981199fa3b206 /buildrun.cxx | |
| parent | 454324f43e021027c5254a62de5e081792efc3fc (diff) | |
| download | systemtap-steved-b0a34eab9633267e2a2da6e4b2b984725e68d158.tar.gz systemtap-steved-b0a34eab9633267e2a2da6e4b2b984725e68d158.tar.xz systemtap-steved-b0a34eab9633267e2a2da6e4b2b984725e68d158.zip | |
PR7062: base uprobes tree on s.runtime_path instead of PKGDATADIR
Diffstat (limited to 'buildrun.cxx')
| -rw-r--r-- | buildrun.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/buildrun.cxx b/buildrun.cxx index 9078a035..ece9eda4 100644 --- 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()); |