Make XENFIRMWAREDIR a subdir of libexecdir

Put the firmware files below libexecdir. This is essentially just a new
name for the existing path. It has the benefit that it can be configured
via --libexecdir= if required.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ ijc -- ran autogen.sh as requested ]

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 9fd87c5af3e35ad0d3161dfba6e0f5380a60159c..50d40ccbf7bc1679dcd8311b6cb59028af8c42e9 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -55,7 +55,7 @@ BASH_COMPLETION_DIR      := $(CONFIG_DIR)/bash_completion.d
 XEN_LOCK_DIR             := @XEN_LOCK_DIR@
 XEN_PAGING_DIR           := @XEN_PAGING_DIR@
 
-XENFIRMWAREDIR           := @XENFIRMWAREDIR@
+XENFIRMWAREDIR           := $(LIBEXEC)/boot
 
 XEN_CONFIG_DIR           := @XEN_CONFIG_DIR@
 XEN_SCRIPT_DIR           := @XEN_SCRIPT_DIR@

diff --git a/configure b/configure
index 4b7aa570d29caf1d5254b9ac5cae9e50fe2d4e71..de6703793dbe13a40c61b304d52dee5e598722cf 100755 (executable)
--- a/configure
+++ b/configure
@@ -600,7 +600,6 @@ XEN_SCRIPT_DIR
 XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
-XENFIRMWAREDIR
 SHAREDIR
 XEN_LIB_STORED
 XEN_LOG_DIR
@@ -1943,9 +1942,6 @@ XEN_LIB_STORED=$localstatedir/lib/xenstored
 SHAREDIR=$prefix/share
 
 
-XENFIRMWAREDIR=$prefix/lib/xen/boot
-
-
 CONFIG_DIR=$sysconfdir
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index dcb8f28c8e9295a42ffcd28d095e820f83acfaae..46172cb57da9a10a0542b41a907b52a65b99fe34 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -89,9 +89,6 @@ AC_SUBST(XEN_LIB_STORED)
 SHAREDIR=$prefix/share
 AC_SUBST(SHAREDIR)
 
-XENFIRMWAREDIR=$prefix/lib/xen/boot
-AC_SUBST(XENFIRMWAREDIR)
-
 CONFIG_DIR=$sysconfdir
 AC_SUBST(CONFIG_DIR)
 

diff --git a/tools/configure b/tools/configure
index e0aba849ba8b0bb8a237baff7d701d4bff6d3b6a..a37ce424bd125df3894f36c741b962649da8311e 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -715,7 +715,6 @@ XEN_SCRIPT_DIR
 XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
-XENFIRMWAREDIR
 SHAREDIR
 XEN_LIB_STORED
 XEN_LOG_DIR
@@ -3787,9 +3786,6 @@ XEN_LIB_STORED=$localstatedir/lib/xenstored
 SHAREDIR=$prefix/share
 
 
-XENFIRMWAREDIR=$prefix/lib/xen/boot
-
-
 CONFIG_DIR=$sysconfdir