From c37da5d89cbbebc02b68a52a730b0532f65e455c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 26 Nov 2015 22:42:45 +0530 Subject: [PATCH] Revert "build: fix make distcheck." This reverts commit 462727d6d825b6e67119e6b8ea47d9e18cc22bdf. This "fix" broke the build on Windows, where both prefix and datadir are absolute paths and as such we would concatenate two absolute paths and fail. --- configure.ac | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index c4ed1b9103..267e8aa5d5 100644 --- a/configure.ac +++ b/configure.ac @@ -178,15 +178,9 @@ AC_ARG_WITH([bash-completion-dir], [with_bash_completion_dir=yes]) if test "x$with_bash_completion_dir" = "xyes"; then - 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 + 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 BASH_COMPLETION_DIR="$with_bash_completion_dir" fi