tools: jailhouse: Use a libexec subdir for extension scripts

We want our extension scripts to be under a standard directory, namely
$libexecdir/<package>. As libexecdir may be overwritten during
installation, accept it from the Makefile via a define.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/tools/Makefile b/tools/Makefile
index 45554e4c353d19f9190ac15364711a7e87cad6dd..b375d69fdab6f0084a2ebf6c1fa3a4fb3b23ac2e 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,7 @@
 #
 # Jailhouse, a Linux-based partitioning hypervisor
 #
-# Copyright (c) Siemens AG, 2013
+# Copyright (c) Siemens AG, 2013, 2014
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -10,9 +10,13 @@
 # the COPYING file in the top-level directory.
 #
 
+prefix      ?= /usr/local
+exec_prefix ?= $(prefix)
+libexecdir  ?= $(exec_prefix)/libexec
+
 CC = $(CROSS_COMPILE)gcc
 
-CFLAGS = -g -O3 -I.. -I../hypervisor/include \
+CFLAGS = -g -O3 -I.. -I../hypervisor/include -DLIBEXECDIR=\"$(libexecdir)\" \
        -Wall -Wmissing-declarations -Wmissing-prototypes
 
 TARGETS := jailhouse

diff --git a/tools/jailhouse.c b/tools/jailhouse.c
index fbd3cd157fe56e1b024a1bf148c38f1939f161a8..11e2ddebec3e0ecfe4c0478a1e65c2c63d2fbb95 100644 (file)
--- a/tools/jailhouse.c
+++ b/tools/jailhouse.c
@@ -25,6 +25,8 @@
 
 #include <jailhouse.h>
 
+#define JAILHOUSE_EXEC_DIR     LIBEXECDIR "/jailhouse"
+
 enum shutdown_load_mode {LOAD, SHUTDOWN};
 
 struct extension {
@@ -76,7 +78,7 @@ static void call_extension_script(const char *cmd, int argc, char *argv[])
                        continue;
 
                snprintf(new_path, sizeof(new_path), "PATH=%s:%s:%s",
-                       dirname(argv[0]), "/usr/lib/jailhouse",
+                       dirname(argv[0]), JAILHOUSE_EXEC_DIR,
                        getenv("PATH") ? : "");
                putenv(new_path);