Revert "build: fix make distcheck."
authorSebastian Dröge <sebastian@centricular.com>
Thu, 26 Nov 2015 17:12:45 +0000 (22:42 +0530)
committerSebastian Dröge <sebastian@centricular.com>
Thu, 26 Nov 2015 17:12:45 +0000 (22:42 +0530)
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

index c4ed1b9..267e8aa 100644 (file)
@@ -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