From 32206f2e00a6412b03bc4e6e4ee7f94a0ba3b058 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 28 Jan 2024 18:37:44 +0100 Subject: [PATCH] build: Add infrastructure for bash-completions This is the scaffolding to then be able to add the actual support into the source tree. --- configure.ac | 3 +++ dselect/Makefile.am | 3 +++ scripts/Makefile.am | 3 +++ src/Makefile.am | 3 +++ utils/Makefile.am | 5 +++++ 5 files changed, 17 insertions(+) diff --git a/configure.ac b/configure.ac index 3bbb0d14d..b084ade12 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ DPKG_WITH_DIR([aclocaldir], [${datadir}/aclocal], [aclocal m4 fragments files directory [DATADIR/aclocal]]) DPKG_WITH_DIR([polkitactionsdir], [${datadir}/polkit-1/actions], [polkit .policy actions directory [DATADIR/polkit-1/actions]]) +DPKG_WITH_DIR([bashcompletionsdir], [${datadir}/bash-completion/completions], + [bash completions directory [DATADIR/bash-completion/completions]]) DPKG_WITH_DIR([zshcompletionsdir], [${datadir}/zsh/vendor-completions], [zsh vendor completions directory [DATADIR/zsh/vendor-completions]]) @@ -316,6 +318,7 @@ Configuration: pkg-config dir . . . . . . . : $pkgconfigdir aclocal dir . . . . . . . . : $aclocaldir polkit actions dir . . . . . : $polkitactionsdir + bash completions dir . . . . : $bashcompletionsdir zsh completions dir . . . . . : $zshcompletionsdir perl interpreter . . . . . . : $PERL perl libdir . . . . . . . . . : $PERL_LIBDIR diff --git a/dselect/Makefile.am b/dselect/Makefile.am index 17239708e..261eff712 100644 --- a/dselect/Makefile.am +++ b/dselect/Makefile.am @@ -57,6 +57,9 @@ dselect_LDADD = \ ../lib/compat/libcompat.la \ # EOL +dist_bashcompletions_DATA = \ + # EOL + EXTRA_DIST = \ keyoverride \ mkcurkeys.pl \ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 01b154789..8d39d245a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -151,6 +151,9 @@ CLEANFILES += \ $(bin_SCRIPTS) \ # EOL +dist_bashcompletions_DATA = \ + # EOL + dist_zshcompletions_DATA = \ completion/zsh/_dpkg-parsechangelog \ # EOL diff --git a/src/Makefile.am b/src/Makefile.am index f40f2bc34..6d0f2f24a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -134,6 +134,9 @@ dpkg_trigger_SOURCES = \ trigger/main.c \ # EOL +dist_bashcompletions_DATA = \ + # EOL + SUFFIXES = include $(top_srcdir)/build-aux/subst.am diff --git a/utils/Makefile.am b/utils/Makefile.am index f60d6b9ec..2ce3bceb8 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ sbin_PROGRAMS = bin_PROGRAMS = +dist_bashcompletions_DATA = polkitactions_DATA = EXTRA_DIST = CLEANFILES = @@ -36,6 +37,8 @@ update_alternatives_LDADD = \ $(LIBINTL) \ # EOL +dist_bashcompletions_DATA += + polkitactions_DATA += org.dpkg.pkexec.update-alternatives.policy endif @@ -71,6 +74,8 @@ start_stop_daemon_LDADD = \ $(PS_LIBS) \ $(KVM_LIBS) \ # EOL + +dist_bashcompletions_DATA += endif install-data-local: -- 2.11.4.GIT