mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Use configure --localstatedir=BASEDIR to set path to /var
This is helpful to test make uninstall with --prefix=/private/dir as unprivileged user. No change in behaviour is expected by this change. 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 ]
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
ace4996869
commit
0778774676
4 files changed
+43
-25
No files matched your search
@@ -1853,6 +1853,11 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||
|
||||
test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
|
||||
|
||||
if test "$localstatedir" = '${prefix}/var' ; then
|
||||
localstatedir=/var
|
||||
fi
|
||||
|
||||
bindir=`eval echo $bindir`
|
||||
sbindir=`eval echo $sbindir`
|
||||
libdir=`eval echo $libdir`
|
||||
@@ -1907,13 +1912,13 @@ libexecdir=`eval echo $libexecdir`
|
||||
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
|
||||
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
|
||||
|
||||
XEN_LOG_DIR=/var/log/xen
|
||||
XEN_LOG_DIR=$localstatedir/log/xen
|
||||
|
||||
|
||||
XEN_LIB_STORED=/var/lib/xenstored
|
||||
XEN_LIB_STORED=$localstatedir/lib/xenstored
|
||||
|
||||
|
||||
SHAREDIR=$prefix/share
|
||||
@@ -1935,16 +1940,16 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
*freebsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*) XEN_LOCK_DIR=/var/lock ;;
|
||||
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*) XEN_LOCK_DIR=$localstatedir/lock ;;
|
||||
esac
|
||||
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
|
||||
|
||||
XEN_PAGING_DIR=/var/lib/xen/xenpaging
|
||||
XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
|
||||
|
||||
|
||||
|
||||
|
||||
+16
-8
@@ -2,6 +2,14 @@ AC_DEFUN([AX_XEN_EXPAND_CONFIG], [
|
||||
dnl expand these early so we can use this for substitutions
|
||||
test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
|
||||
|
||||
dnl Use /var instead of /usr/local/var because there can be only one
|
||||
dnl xenstored active at a time. All tools have to share this dir, even
|
||||
dnl if they come from a different --prefix=.
|
||||
if test "$localstatedir" = '${prefix}/var' ; then
|
||||
localstatedir=/var
|
||||
fi
|
||||
|
||||
dnl expand exec_prefix or it will endup in substituted variables
|
||||
bindir=`eval echo $bindir`
|
||||
sbindir=`eval echo $sbindir`
|
||||
@@ -58,13 +66,13 @@ dnl This variable will be substituted in various .in files
|
||||
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
|
||||
AC_SUBST(LIBEXEC_BIN)
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
AC_SUBST(XEN_RUN_DIR)
|
||||
|
||||
XEN_LOG_DIR=/var/log/xen
|
||||
XEN_LOG_DIR=$localstatedir/log/xen
|
||||
AC_SUBST(XEN_LOG_DIR)
|
||||
|
||||
XEN_LIB_STORED=/var/lib/xenstored
|
||||
XEN_LIB_STORED=$localstatedir/lib/xenstored
|
||||
AC_SUBST(XEN_LIB_STORED)
|
||||
|
||||
SHAREDIR=$prefix/share
|
||||
@@ -86,15 +94,15 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
|
||||
AC_SUBST(XEN_SCRIPT_DIR)
|
||||
|
||||
case "$host_os" in
|
||||
*freebsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*) XEN_LOCK_DIR=/var/lock ;;
|
||||
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*) XEN_LOCK_DIR=$localstatedir/lock ;;
|
||||
esac
|
||||
AC_SUBST(XEN_LOCK_DIR)
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
AC_SUBST(XEN_RUN_DIR)
|
||||
|
||||
XEN_PAGING_DIR=/var/lib/xen/xenpaging
|
||||
XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
|
||||
AC_SUBST(XEN_PAGING_DIR)
|
||||
])
|
||||
+1
-1
@@ -209,7 +209,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
|
||||
-Wl,-rpath=$(PREFIX)/lib/xen/lib" \
|
||||
--bindir=$(LIBEXEC_BIN) \
|
||||
--datadir=$(SHAREDIR)/qemu-xen \
|
||||
--localstatedir=/var \
|
||||
--localstatedir=$(localstatedir) \
|
||||
--disable-kvm \
|
||||
--disable-docs \
|
||||
--disable-guest-agent \
|
||||
|
||||
Vendored
+13
-8
@@ -3688,6 +3688,11 @@ esac
|
||||
|
||||
test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
|
||||
|
||||
if test "$localstatedir" = '${prefix}/var' ; then
|
||||
localstatedir=/var
|
||||
fi
|
||||
|
||||
bindir=`eval echo $bindir`
|
||||
sbindir=`eval echo $sbindir`
|
||||
libdir=`eval echo $libdir`
|
||||
@@ -3742,13 +3747,13 @@ libexecdir=`eval echo $libexecdir`
|
||||
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
|
||||
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
|
||||
|
||||
XEN_LOG_DIR=/var/log/xen
|
||||
XEN_LOG_DIR=$localstatedir/log/xen
|
||||
|
||||
|
||||
XEN_LIB_STORED=/var/lib/xenstored
|
||||
XEN_LIB_STORED=$localstatedir/lib/xenstored
|
||||
|
||||
|
||||
SHAREDIR=$prefix/share
|
||||
@@ -3770,16 +3775,16 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
*freebsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=/var/lib ;;
|
||||
*) XEN_LOCK_DIR=/var/lock ;;
|
||||
*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;;
|
||||
*) XEN_LOCK_DIR=$localstatedir/lock ;;
|
||||
esac
|
||||
|
||||
|
||||
XEN_RUN_DIR=/var/run/xen
|
||||
XEN_RUN_DIR=$localstatedir/run/xen
|
||||
|
||||
|
||||
XEN_PAGING_DIR=/var/lib/xen/xenpaging
|
||||
XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
|
||||
|
||||
|
||||
|
||||
|
||||