From e90d0ed98e4dc916124dcb8fdf41e10bddfe036c Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 14 Mar 2019 10:47:20 -0400 Subject: [PATCH] build: Move completions to /usr/share rdgo is choking on this right now because, even though we added `/usr/share/bash-completion` to the list of dirs to check in the spec file[1], we don't have `bash-completion` installed in the buildroot, so the `completionsdir` pkgconfig var isn't defined and we end up defaulting to `/etc/bash_completion.d`. el7's bash (not that it matters much now after #1785) is indeed new enough to know that location. See also https://github.com/ostreedev/ostree/pull/1083. [1] https://src.fedoraproject.org/rpms/rpm-ostree/pull-request/30 Closes: #1786 Approved by: rfairley --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ef43fb7f7d..1f2896c0ec 100644 --- a/configure.ac +++ b/configure.ac @@ -223,7 +223,7 @@ m4_define_default( AS_IF([test -n "$$1"], [$4], [$5])]) PKG_CHECK_VAR(BASH_COMPLETIONSDIR, [bash-completion], [completionsdir],, - BASH_COMPLETIONSDIR="${sysconfdir}/bash_completion.d") + BASH_COMPLETIONSDIR="${datadir}/bash-completion/completions") AC_SUBST(BASH_COMPLETIONSDIR) AC_PATH_PROG([cargo], [cargo])