Skip to content

Commit 70f6215

Browse files
committed
build: fix install-data-hook for bash_completion.d
It no longer matches bash_completion so it was not substituting for the actual compatdir due to a refactor. Follow-up for cdd8a15
1 parent 6bd5e26 commit 70f6215

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ EXTRA_DIST = CHANGELOG.md $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \
3636

3737
install-data-hook:
3838
tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \
39-
$(SED) -e 's|-/etc/bash_completion\.d|-$(compatdir)|' \
39+
$(SED) -e 's|(/etc/bash_completion\.d|($(compatdir)|' \
4040
$(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion >$$tmpfile && \
4141
cat $$tmpfile >$(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion && \
4242
rm $$tmpfile

bash_completion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3424,6 +3424,7 @@ _comp__init_collect_startup_configs()
34243424
if [[ ${BASH_COMPLETION_COMPAT_DIR-} ]]; then
34253425
compat_dirs+=("$BASH_COMPLETION_COMPAT_DIR")
34263426
else
3427+
# Keep in sync with install-data-hook at Makefile.am
34273428
compat_dirs+=(/etc/bash_completion.d)
34283429
# Similarly as for the "completions" dir, look up from relative to
34293430
# bash_completion, primarily for installed-with-prefix and

0 commit comments

Comments
 (0)