summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-12-03 02:44:24 +0100
committerAllan McRae <allan@archlinux.org>2018-12-04 08:20:57 +0100
commit65e09705d3ad781fd41cf1996f2b60e2e2c1975b (patch)
treee46520b1e8b343304649931d1a7feabea345cf11
parentf615f7bd5ae2764bd58e2947e0f33e75fa182078 (diff)
downloadpacman-65e09705d3ad781fd41cf1996f2b60e2e2c1975b.tar.gz
pacman-65e09705d3ad781fd41cf1996f2b60e2e2c1975b.tar.xz
Make `make distcheck` work when bash-completion is installed.
bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 85be82b4..1e9ee152 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ ACLOCAL_AMFLAGS = -I m4 --install
AM_MAKEFLAGS = --no-print-directory
# Make sure we test and build manpages when doing distcheck
-DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \
+ bashcompdir='$${prefix}/share/bash-completion/completions'
# Some files automatically included, so they aren't specified below:
# AUTHORS, COPYING, NEWS, README