[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH 24/46] remove duplicate variables from config



On Mon, 2014-09-22 at 15:00 +0200, Olaf Hering wrote:
> ... 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@xxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

(note to committer: run autogen.sh)

> ---
>  Config.mk            |  1 -
>  config/NetBSD.mk     |  5 -----
>  config/NetBSDRump.mk |  2 --
>  config/Paths.mk.in   |  1 -
>  config/StdGNU.mk     | 14 --------------
>  config/SunOS.mk      |  8 --------
>  m4/paths.m4          | 20 ++++++++++++++------
>  7 files changed, 14 insertions(+), 37 deletions(-)
> 
> diff --git a/Config.mk b/Config.mk
> index fc2e312..75282d7 100644
> --- 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 141de7c..21318d6 100644
> --- 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 8daade8..2a87218 100644
> --- 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 c01d0ef..4bded93 100644
> --- 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 4cc3a01..dd6170c 100644
> --- 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 1470514..92bde78 100644
> --- 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/m4/paths.m4 b/m4/paths.m4
> index d33a9e6..0255966 100644
> --- 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
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.