[Xen-devel] [PATCH 22/28] Make XENFIRMWAREDIR a subdir of libexecdir

[Olaf Hering <olaf@xxxxxxxxx>]

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.

Please rerun autogen.sh after applying this patch.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 config/Paths.mk.in | 2 +-
 m4/paths.m4        | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 9fd87c5..50d40cc 100644
--- 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/m4/paths.m4 b/m4/paths.m4
index 9fb4fcd..d647f65 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -99,9 +99,6 @@ case "$host_os" in
 esac
 AC_SUBST(PRIVATE_BINDIR)
 
-XENFIRMWAREDIR=$prefix/lib/xen/boot
-AC_SUBST(XENFIRMWAREDIR)
-
 CONFIG_DIR=$sysconfdir
 AC_SUBST(CONFIG_DIR)
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel