summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@trick.home.annexia.org>2009-08-10 09:26:22 +0100
committerRichard Jones <rjones@trick.home.annexia.org>2009-08-10 09:26:22 +0100
commit8e46d4ba64bdf396ac0324160ced4800d112c18d (patch)
tree3dfe785c368c16f9e9311176c12099bc12321aaa
parentb60d5c17c6b36a2d55627e0939041bcbafcfeac3 (diff)
downloadvirt-what-8e46d4ba64bdf396ac0324160ced4800d112c18d.tar.gz
virt-what-8e46d4ba64bdf396ac0324160ced4800d112c18d.tar.xz
virt-what-8e46d4ba64bdf396ac0324160ced4800d112c18d.zip
Move virt-what-cpuid-helper to /usr/libexec.
-rw-r--r--Makefile.am2
-rw-r--r--virt-what.in7
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index f74b8cf..8efacb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES = virt-what.1 virt-what.txt
AM_CPPFLAGS = -Wall
bin_SCRIPTS = virt-what
-bin_PROGRAMS = virt-what-cpuid-helper
+libexec_PROGRAMS = virt-what-cpuid-helper
man_MANS = virt-what.1
diff --git a/virt-what.in b/virt-what.in
index 8ac09f5..11ca772 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -63,7 +63,12 @@ if [ "$uid" != 0 ]; then
fail "this script must be run as root"
fi
-PATH=/sbin:/usr/sbin:$PATH
+# Add /sbin and /usr/sbin to the path so we can find system
+# binaries like dmicode.
+# Add /usr/libexec to the path so we can find the helper binary.
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+PATH=@libexecdir@:/sbin:/usr/sbin:$PATH
# Check for various products in the BIOS information.