From: Richard Jones <rjones@trick.home.annexia.org>
Date: Mon, 10 Aug 2009 08:26:22 +0000 (+0100)
Subject: Move virt-what-cpuid-helper to /usr/libexec.
X-Git-Tag: 1.2~2
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8e46d4ba64bdf396ac0324160ced4800d112c18d;hp=b60d5c17c6b36a2d55627e0939041bcbafcfeac3;p=virt-what.git

Move virt-what-cpuid-helper to /usr/libexec.
---

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.