remove duplicate variables from config

... because they are already in Paths.mk:
BINDIR, LIBEXEC, PRIVATE_BINDIR, PRIVATE_PREFIX, SBINDIR, SHAREDIR,
XEN_CONFIG_DIR, XENFIRMWAREDIR, XEN_LOCK_DIR, XEN_PAGING_DIR,
XEN_RUN_DIR. Remove unused PKG_XEN_PREFIX, which was also incorrectly
assigned to PRIVATE_PREFIX.

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.mk b/Config.mk
index e4ff64d3a1aa0f9ecbb51ab05b94233966a3edd9..9bda626a55aadb0bbbb1d9dae8f40768322df9af 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -58,7 +58,6 @@ endif
 include $(XEN_ROOT)/config/$(XEN_OS).mk
 include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
 
-SHAREDIR    ?= $(PREFIX)/share
 DOCDIR      ?= $(SHAREDIR)/doc/xen
 MANDIR      ?= $(SHAREDIR)/man
 BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d

diff --git a/config/NetBSD.mk b/config/NetBSD.mk
index 141de7cf34987994a6184d3a3b289ef51a08c84d..21318d6f1df58c28889b1831cf63eadddb4b8a0e 100644 (file)
--- a/config/NetBSD.mk
+++ b/config/NetBSD.mk
@@ -1,11 +1,6 @@
 include $(XEN_ROOT)/config/StdGNU.mk
 
 # Override settings for this OS
-LIBEXEC = $(PREFIX)/libexec
-PRIVATE_BINDIR = $(BINDIR)
-
 DLOPEN_LIBS =
 
-XEN_LOCK_DIR = /var/lib
-
 WGET = ftp

diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk
index 8daade8eb39513f496e1ec5cb8b2ec0fd704ce8d..2a872189c3f65fd46c9d17da189b2029b3aeda66 100644 (file)
--- a/config/NetBSDRump.mk
+++ b/config/NetBSDRump.mk
@@ -3,8 +3,6 @@ include $(XEN_ROOT)/config/StdGNU.mk
 DLOPEN_LIBS =
 PTHREAD_LIBS =
 
-XEN_LOCK_DIR = /var/lib
-
 WGET = ftp
 
 XENSTORE_XENSTORED=n

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index c01d0ef44945c7ecf533d163ba14568659c54288..4bded939384a8ef06a714f2c3ff4a98b2968c52f 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -29,7 +29,6 @@ XEN_LOCK_DIR             := @XEN_LOCK_DIR@
 XEN_PAGING_DIR           := @XEN_PAGING_DIR@
 
 PRIVATE_PREFIX           := @PRIVATE_PREFIX@
-PRIVATE_PREFIX           := @PKG_XEN_PREFIX@
 PRIVATE_BINDIR           := @PRIVATE_BINDIR@
 
 XENFIRMWAREDIR           := @XENFIRMWAREDIR@

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 4cc3a01a88926587dc13c8a3deca1e02cb6c0800..dd6170cd7ff2fe405e21ec3db42ca1aa60b35064 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -28,27 +28,13 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
-LIBEXEC = $(PREFIX)/lib/xen/bin
-SHAREDIR = $(PREFIX)/share
 MANDIR = $(SHAREDIR)/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
-SBINDIR = $(PREFIX)/sbin
-XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
-
-PRIVATE_PREFIX = $(LIBDIR)/xen
-PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
-
-XEN_LOCK_DIR = /var/lock
-XEN_RUN_DIR = /var/run/xen
-XEN_PAGING_DIR = /var/lib/xen/xenpaging
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
 
-XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
-
 BOOT_DIR ?= /boot
 
 SOCKET_LIBS =

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 14705146b544b78267edeb5ad2ec325d1b2b6074..92bde7806c5da31b484a5b154f524683f21dab8a 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -20,18 +20,10 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 MANDIR = $(PREFIX)/share/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
-SBINDIR = $(PREFIX)/sbin
-XENFIRMWAREDIR = $(LIBDIR)/xen/boot
-
-PRIVATE_PREFIX = $(LIBDIR)/xen
-PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
-
-XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
 
 BOOT_DIR ?= /boot
 

diff --git a/configure b/configure
index 7a3d444232122ce3947f2b1d419aa92feaee319a..6b01c35013f0a60bb025a0774789e8a4e7eab8c3 100755 (executable)
--- a/configure
+++ b/configure
@@ -602,7 +602,6 @@ INITD_DIR
 CONFIG_DIR
 XENFIRMWAREDIR
 PRIVATE_BINDIR
-PKG_XEN_PREFIX
 PRIVATE_PREFIX
 SHAREDIR
 XEN_LIB_STORED
@@ -1904,7 +1903,10 @@ BINDIR=$prefix/bin
 SBINDIR=$prefix/sbin
 
 
-LIBEXEC=$prefix/lib/xen/bin
+case "$host_os" in
+*netbsd*)  LIBEXEC=$prefix/libexec ;;
+*) LIBEXEC=$prefix/lib/xen/bin ;;
+esac
 
 
 LIBDIR=`eval echo $libdir`
@@ -1925,10 +1927,11 @@ SHAREDIR=$prefix/share
 PRIVATE_PREFIX=$LIBDIR/xen
 
 
-PKG_XEN_PREFIX=$LIBDIR/xen
-
-
-PRIVATE_BINDIR=$PRIVATE_PREFIX/bin
+case "$host_os" in
+*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
+*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+esac
 
 
 XENFIRMWAREDIR=$prefix/lib/xen/boot
@@ -1946,7 +1949,11 @@ XEN_CONFIG_DIR=$CONFIG_DIR/xen
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 
 
-XEN_LOCK_DIR=/var/lock
+case "$host_os" in
+*freebsd*) XEN_LOCK_DIR=/var/lib ;;
+*netbsd*) XEN_LOCK_DIR=/var/lib ;;
+*) XEN_LOCK_DIR=/var/lock ;;
+esac
 
 
 XEN_RUN_DIR=/var/run/xen

diff --git a/m4/paths.m4 b/m4/paths.m4
index 19b64816b439bde57eb858cfdb5fbe772ca77cc1..178b9a993a19e3ea820c8aedc07d383d2e1f2888 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -47,7 +47,10 @@ AC_SUBST(SBINDIR)
 
 dnl XXX: this should be changed to use the passed $libexec
 dnl but can be done as a second step
-LIBEXEC=$prefix/lib/xen/bin
+case "$host_os" in
+*netbsd*)  LIBEXEC=$prefix/libexec ;;
+*) LIBEXEC=$prefix/lib/xen/bin ;;
+esac
 AC_SUBST(LIBEXEC)
 
 LIBDIR=`eval echo $libdir`
@@ -68,10 +71,11 @@ AC_SUBST(SHAREDIR)
 PRIVATE_PREFIX=$LIBDIR/xen
 AC_SUBST(PRIVATE_PREFIX)
 
-PKG_XEN_PREFIX=$LIBDIR/xen
-AC_SUBST(PKG_XEN_PREFIX)
-
-PRIVATE_BINDIR=$PRIVATE_PREFIX/bin
+case "$host_os" in
+*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
+*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+esac
 AC_SUBST(PRIVATE_BINDIR)
 
 XENFIRMWAREDIR=$prefix/lib/xen/boot
@@ -89,7 +93,11 @@ AC_SUBST(XEN_CONFIG_DIR)
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 AC_SUBST(XEN_SCRIPT_DIR)
 
-XEN_LOCK_DIR=/var/lock
+case "$host_os" in
+*freebsd*) XEN_LOCK_DIR=/var/lib ;;
+*netbsd*) XEN_LOCK_DIR=/var/lib ;;
+*) XEN_LOCK_DIR=/var/lock ;;
+esac
 AC_SUBST(XEN_LOCK_DIR)
 
 XEN_RUN_DIR=/var/run/xen

diff --git a/tools/configure b/tools/configure
index a9d78aea2ef88f0e7da3f8c0820157d3a1a14bf2..509d5ef1d76128e6e8fce5b28929a0962ede3889 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -715,7 +715,6 @@ INITD_DIR
 CONFIG_DIR
 XENFIRMWAREDIR
 PRIVATE_BINDIR
-PKG_XEN_PREFIX
 PRIVATE_PREFIX
 SHAREDIR
 XEN_LIB_STORED
@@ -3739,7 +3738,10 @@ BINDIR=$prefix/bin
 SBINDIR=$prefix/sbin
 
 
-LIBEXEC=$prefix/lib/xen/bin
+case "$host_os" in
+*netbsd*)  LIBEXEC=$prefix/libexec ;;
+*) LIBEXEC=$prefix/lib/xen/bin ;;
+esac
 
 
 LIBDIR=`eval echo $libdir`
@@ -3760,10 +3762,11 @@ SHAREDIR=$prefix/share
 PRIVATE_PREFIX=$LIBDIR/xen
 
 
-PKG_XEN_PREFIX=$LIBDIR/xen
-
-
-PRIVATE_BINDIR=$PRIVATE_PREFIX/bin
+case "$host_os" in
+*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
+*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
+esac
 
 
 XENFIRMWAREDIR=$prefix/lib/xen/boot
@@ -3781,7 +3784,11 @@ XEN_CONFIG_DIR=$CONFIG_DIR/xen
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 
 
-XEN_LOCK_DIR=/var/lock
+case "$host_os" in
+*freebsd*) XEN_LOCK_DIR=/var/lib ;;
+*netbsd*) XEN_LOCK_DIR=/var/lib ;;
+*) XEN_LOCK_DIR=/var/lock ;;
+esac
 
 
 XEN_RUN_DIR=/var/run/xen