[Xen-devel] [PATCH 34/46] 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.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 config/Paths.mk.in | 2 +-
 m4/paths.m4        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index c2a6d91..518cf1d 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -35,7 +35,7 @@ BASH_COMPLETION_DIR      := @BASH_COMPLETION_DIR@
 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 664b434..f89378c 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -73,10 +73,12 @@ LIBEXEC=`eval echo $libexecdir/xen`
 LIBEXEC_BIN=$LIBEXEC/bin
 LIBEXEC_LIB=$LIBEXEC/lib
 LIBEXEC_INC=$LIBEXEC/include
+LIBEXEC_BOOT=$LIBEXEC/boot
 AC_SUBST(LIBEXEC)
 AC_SUBST(LIBEXEC_BIN)
 AC_SUBST(LIBEXEC_LIB)
 AC_SUBST(LIBEXEC_INC)
+AC_SUBST(LIBEXEC_BOOT)
 
 LIBDIR=`eval echo $libdir`
 AC_SUBST(LIBDIR)
@@ -101,9 +103,6 @@ dnl double eval because default docdir includes 
datarootdir, which includes pref
 DOCDIR=`eval eval echo $docdir`
 AC_SUBST(DOCDIR)
 
-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