diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 9fd87c5af3..50d40ccbf7 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/configure b/configure index 4b7aa570d2..de6703793d 100755 --- 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 dcb8f28c8e..46172cb57d 100644 --- 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 e0aba849ba..a37ce424bd 100755 --- 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