autotools: Fix bash-completion installation

diff --git a/Makefile.am b/Makefile.am
index b58af36b51caa5789eb2d4ef55775bac15ab6629..417cdf22fe3f11837c319d5a62cb1a5c180291f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ CLEANFILES =
 
 EXTRA_DIST = HACKING meson.build meson_options.txt po/meson.build \
        doc/manual/meson.build doc/manual/userdir.xml.in \
-       doc/manual/sysdir.xml.in doc/manual/version.xml.in
+       doc/manual/sysdir.xml.in doc/manual/version.xml.in \
+       bash-completion
 
 incdir = $(includedir)/p11-kit-1/p11-kit
 inc_HEADERS =
@@ -42,6 +43,8 @@ TESTS = $(c_tests) $(sh_tests)
 moduledir = $(p11_module_path)
 module_LTLIBRARIES =
 
+bashcomp_DATA =
+
 include common/Makefile.am
 include p11-kit/Makefile.am
 
@@ -49,14 +52,6 @@ if WITH_TRUST_MODULE
 include trust/Makefile.am
 endif
 
-if WITH_BASH_COMPLETION
-bashcompdir = $(datadir)/bash-completion/completions
-dist_bashcomp_DATA = bash-completion/p11-kit
-if WITH_TRUST_MODULE
-dist_bashcomp_DATA += bash-completion/trust
-endif
-endif
-
 SUBDIRS = . doc po
 
 ACLOCAL_AMFLAGS = -I build/m4

diff --git a/configure.ac b/configure.ac
index df0d8c5bddc81035739872f86662f6ee4a94852f..77b31cfb0662ae2c24f26478a76659d2c663ece8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -574,7 +574,10 @@ AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"])
 # --------------------------------------------------------------------
 # bash completion
 
-PKG_CHECK_VAR([bashcompdir], [bash-completion], [with_bash_completion=yes])
+PKG_CHECK_VAR([bashcompdir], [bash-completion], [completionsdir],
+       [with_bash_completion=yes])
+AC_SUBST(bashcompdir)
+
 AM_CONDITIONAL(WITH_BASH_COMPLETION, [test "$with_bash_completion" = "yes"])
 
 

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 681dc1755742caf69e97ee798d14e6c085050572..9f3d42ba96e14e7b614355a96c5ebe23cf827a2a 100644 (file)
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -246,6 +246,10 @@ p11_kit_p11_kit_LDADD = \
        $(LTLIBINTL) \
        $(NULL)
 
+if WITH_BASH_COMPLETION
+bashcomp_DATA += bash-completion/p11-kit
+endif
+
 private_PROGRAMS += p11-kit/p11-kit-remote
 
 p11_kit_p11_kit_remote_SOURCES = \

diff --git a/trust/Makefile.am b/trust/Makefile.am
index b050a8faa061978a09f75002d74905b7ab7d8a1c..f708b473de3efdf66affd14771c92b17d38e9679 100644 (file)
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -119,6 +119,10 @@ externaldir = $(privatedir)
 external_SCRIPTS = \
        trust/trust-extract-compat
 
+if WITH_BASH_COMPLETION
+bashcomp_DATA += bash-completion/trust
+endif
+
 EXTRA_DIST += \
        trust/p11-kit-trust.module \
        trust/meson.build