From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.gmx.net ([212.227.15.18]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YT7Bg-0005Um-Op for ptxdist@pengutronix.de; Wed, 04 Mar 2015 12:10:01 +0100 From: carsten.schlote@gmx.net Date: Wed, 4 Mar 2015 12:09:37 +0100 Message-Id: <1425467377-7470-3-git-send-email-carsten.schlote@gmx.net> In-Reply-To: <1425467377-7470-1-git-send-email-carsten.schlote@gmx.net> References: <1425467377-7470-1-git-send-email-carsten.schlote@gmx.net> Subject: [ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Carsten Schlote From: Carsten Schlote This patch just changes the name of some bash config option, so that the bash-completion package won't conflict with the bash package anymore. Signed-off-by: Carsten Schlote --- rules/bash.in | 2 +- rules/bash.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/bash.in b/rules/bash.in index beb35c5..059bc9d 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -186,7 +186,7 @@ config BASH_PROCSUBST named pipes (FIFOs) or the '/dev/fd' method of naming open files. It takes the form of <(list) or >(list). -config BASH_COMPLETION +config BASH_BASHCOMPLETION bool prompt "Enable programmable completion" help diff --git a/rules/bash.make b/rules/bash.make index 238eb75..a29c9c6 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -63,7 +63,7 @@ BASH_AUTOCONF := \ --$(call ptx/endis, PTXCONF_BASH_MULTIBYTE)-multibyte \ --disable-net-redirections \ --$(call ptx/endis, PTXCONF_BASH_PROCSUBST)-process-substitution \ - --$(call ptx/endis, PTXCONF_BASH_COMPLETION)-progcomp \ + --$(call ptx/endis, PTXCONF_BASH_BASHCOMPLETION)-progcomp \ --$(call ptx/endis, PTXCONF_BASH_ESC)-prompt-string-decoding \ --$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \ --$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \ -- 2.3.1 -- ptxdist mailing list ptxdist@pengutronix.de