Skip to content

Commit 5fc6033

Browse files
yedayakblucascop
authored
build: fix install-data-hook for bash_completion.d (#1447)
* 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 * Update bash_completion --------- Co-authored-by: Luca Boccassi <luca.boccassi@gmail.com> Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>
1 parent 2bfade7 commit 5fc6033

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
@@ -3490,6 +3490,7 @@ _comp__init_collect_startup_configs()
34903490
if [[ ${BASH_COMPLETION_COMPAT_DIR-} ]]; then
34913491
compat_dirs+=("$BASH_COMPLETION_COMPAT_DIR")
34923492
else
3493+
# Keep in sync with Makefile.am install-data-hook
34933494
compat_dirs+=(/etc/bash_completion.d)
34943495
# Similarly as for the "completions" dir, look up from relative to
34953496
# bash_completion, primarily for installed-with-prefix and

0 commit comments

Comments
 (0)