From 462727d6d825b6e67119e6b8ea47d9e18cc22bdf Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Tue, 24 Feb 2015 18:00:34 +0100 Subject: [PATCH] build: fix make distcheck. And install bash-completions in the supplied prefix. --- configure.ac | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 14086b26a9..0ee1243fdd 100644 --- a/configure.ac +++ b/configure.ac @@ -173,9 +173,15 @@ AC_ARG_WITH([bash-completion-dir], [with_bash_completion_dir=yes]) if test "x$with_bash_completion_dir" = "xyes"; then - PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], - [BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"], - [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"]) + if test "x$prefix" = xNONE; then + PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], + [BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"], + [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"]) + else + PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], + [BASH_COMPLETION_DIR="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"], + [BASH_COMPLETION_DIR="$prefix/$datadir/bash-completion/completions"]) + fi else BASH_COMPLETION_DIR="$with_bash_completion_dir" fi