From: Olaf Hering Subject: [PATCH 33/46] Add configure --with-bash_completion-dir=DIR Date: Mon, 22 Sep 2014 15:00:22 +0200 Message-ID: <1411390835-7348-34-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Olaf Hering --- Config.mk | 2 -- config/Paths.mk.in | 1 + m4/paths.m4 | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 3947e85..4eae6d2 100644 --- a/Config.mk +++ b/Config.mk @@ -58,8 +58,6 @@ endif include $(XEN_ROOT)/config/$(XEN_OS).mk include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk -BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d - # arguments: variable, common path part, path to test, if yes, if no define setvar_dir ifndef $(1) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 2ff017a..c2a6d91 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,6 +31,7 @@ XEN_LIB_STORED := @XEN_LIB_STORED@ CONFIG_DIR := @CONFIG_DIR@ INITD_DIR := @INITD_DIR@ +BASH_COMPLETION_DIR := @BASH_COMPLETION_DIR@ XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ diff --git a/m4/paths.m4 b/m4/paths.m4 index deb9196..664b434 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -42,6 +42,13 @@ AC_ARG_WITH([initd-dir], ;; esac]) +AC_ARG_WITH([bash_completion-dir], + AS_HELP_STRING([--with-bash_completion-dir=DIR], + [Path to directory with sysv runlevel scripts. [SYSCONFDIR/bash_completion.d]]), + [BASH_COMPLETION_DIR=$withval], + [BASH_COMPLETION_DIR=$sysconfdir/bash_completion.d]) +AC_SUBST(BASH_COMPLETION_DIR) + BINDIR=$prefix/bin AC_SUBST(BINDIR)