[pacman-dev] [PATCH] Make `make distcheck` work again.

Eli Schwartz eschwartz at archlinux.org
Mon Dec 3 01:44:24 UTC 2018


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 at archlinux.org>
---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.19.2


More information about the pacman-dev mailing list