From 10e6284b70b6246dcccf9bff756c5f2f934ec5ed Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Mon, 19 Jan 2015 18:14:02 +0200 Subject: 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 Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/util-linux') 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 -- cgit v1.2.1