Re: [Xen-devel] [PATCH 04/28] Add configure --with-initddir=DIR

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2014-09-25 at 17:19 +0200, Olaf Hering wrote:
> Preserve existing behaviour: Fedora gets rc.d/init.d, BSD gets rc.d,
> everyone else gets init.d.
> 
> Please rerun autogen.sh after applying this patch.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  Config.mk                    |  1 -
>  config/Paths.mk.in           |  1 +
>  docs/misc/distro_mapping.txt |  5 +++--
>  m4/paths.m4                  | 20 ++++++++++++++++++++
>  4 files changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 2bb8dcc..e4ff64d 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -76,7 +76,6 @@ endef
>  
>  # See distro_mapping.txt for other options
>  $(eval $(call setvar_dir,CONFIG_LEAF_DIR,,/etc/sysconfig,sysconfig,default))
> -$(eval $(call setvar_dir,INITD_DIR,/etc,/rc.d/init.d,/rc.d/init.d,/init.d))
>  
>  ifneq ($(EXTRA_PREFIX),)
>  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
> diff --git a/config/Paths.mk.in b/config/Paths.mk.in
> index 507b6d1..c01d0ef 100644
> --- a/config/Paths.mk.in
> +++ b/config/Paths.mk.in
> @@ -24,6 +24,7 @@ XEN_LOG_DIR              := @XEN_LOG_DIR@
>  XEN_LIB_STORED           := @XEN_LIB_STORED@
>  
>  CONFIG_DIR               := @CONFIG_DIR@
> +INITD_DIR                := @INITD_DIR@
>  XEN_LOCK_DIR             := @XEN_LOCK_DIR@
>  XEN_PAGING_DIR           := @XEN_PAGING_DIR@
>  
> diff --git a/docs/misc/distro_mapping.txt b/docs/misc/distro_mapping.txt
> index f849d07..d2b1399 100644
> --- a/docs/misc/distro_mapping.txt
> +++ b/docs/misc/distro_mapping.txt
> @@ -13,8 +13,9 @@ build host, via the "setvar_dir" macro in Config.mk) and 
> for some
>  scripts at run-time.  If the Red Hat directory exists, it is used;
>  otherwise the Debian one is used.
>  
> -You can override this by setting the variables in the environment or
> -your ".config" (which is included by .config).
> +The INITD_DIR path can be changed with configure --with-initddir=DIR.
> +The CONFIG_LEAF_DIR path can be changed by setting the variables in
> +the environment or your ".config" (which is included by Config.mk). 
>  
>  To add support for new distributions that don't use the above locations,
>  one must grep for the above elements and add appropriate checks.
> diff --git a/m4/paths.m4 b/m4/paths.m4
> index b183845..19b6481 100644
> --- a/m4/paths.m4
> +++ b/m4/paths.m4
> @@ -22,6 +22,23 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
>      esac
>  fi
>  
> +AC_ARG_WITH([initddir],
> +    AS_HELP_STRING([--with-initddir=DIR],
> +    [Path to directory with sysv runlevel scripts. [SYSCONFDIR/init.d]]),
> +    [initddir_path=$withval],
> +    [case "$host_os" in
> +         *linux*)
> +         if test -d $sysconfdir/rc.d/init.d ; then
> +             initddir_path=$sysconfdir/rc.d/init.d
> +         else
> +             initddir_path=$sysconfdir/init.d
> +         fi
> +         ;;
> +         *)
> +         initddir_path=$sysconfdir/rc.d
> +         ;;
> +     esac])
> +
>  BINDIR=$prefix/bin
>  AC_SUBST(BINDIR)
>  
> @@ -63,6 +80,9 @@ AC_SUBST(XENFIRMWAREDIR)
>  CONFIG_DIR=$sysconfdir
>  AC_SUBST(CONFIG_DIR)
>  
> +INITD_DIR=$initddir_path
> +AC_SUBST(INITD_DIR)
> +
>  XEN_CONFIG_DIR=$CONFIG_DIR/xen
>  AC_SUBST(XEN_CONFIG_DIR)
>  
> 
> _______________________________________________
> 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