aboutsummaryrefslogtreecommitdiff
path: root/package/util-linux
diff options
context:
space:
mode:
authorGravatar Maxim Mikityanskiy <maxtram95@gmail.com>2015-01-19 18:14:02 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-26 22:47:51 +0100
commit10e6284b70b6246dcccf9bff756c5f2f934ec5ed (patch)
tree034fd6d7f6305c1364426aa64a60ab806e56f237 /package/util-linux
parentafac57162f638e2799953fd8041d64ad383f41b9 (diff)
downloadbuildroot-10e6284b70b6246dcccf9bff756c5f2f934ec5ed.tar.gz
buildroot-10e6284b70b6246dcccf9bff756c5f2f934ec5ed.tar.bz2
package: install bash-completion files only with bash
package/systemd, package/kmod, package/util-linux: don't install bash-completion files if bash is not selected to be installed. Otherwise, install bash-completion files. package/systemd: don't install zsh-completion files is zsh is not selected to be installed. Otherwise, install zsh-completion files. package/util-linux: don't install empty /usr/share/bash-completion/completions directory if bash is not going to be installed, and install bash-completion files if bash is selected to be installed. Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/util-linux')
-rw-r--r--package/util-linux/util-linux.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index a530596ea6..c8fb77c30c 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -21,9 +21,14 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
UTIL_LINUX_CONF_OPTS += \
--disable-rpath \
--disable-makeinstall-chown \
- --disable-bash-completion \
--without-python
+ifeq ($(BR2_PACKAGE_BASH),)
+UTIL_LINUX_CONF_OPTS += \
+ --disable-bash-completion \
+ --with-bashcompletiondir=
+endif
+
# We don't want the host-busybox dependency to be added automatically
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf