install bash completion where pkg-config tells us to

Signed-off-by: Evgeni Golov <evgeni@debian.org>

diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am
index b1768c9e157724dc10a6274c0bdb111e46ad0fe2..b97e2a4991b9aa38cba81f1ca5489e1975078559 100644 (file)
--- a/config/bash/Makefile.am
+++ b/config/bash/Makefile.am
@@ -1,14 +1,5 @@
 EXTRA_DIST = lxc
 
 if ENABLE_BASH
-install-bash:
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
-       $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
-
-uninstall-bash:
-       rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
-       rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
-
-install-data-local: install-bash
-uninstall-local: uninstall-bash
+dist_bashcomp_DATA = lxc
 endif

diff --git a/configure.ac b/configure.ac
index 44a6286d283beb14adc429cb12d98ce06c360ebd..29105fb4a9db9e64d98f9f93efca452ec0dd91c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -413,6 +413,14 @@ AC_ARG_ENABLE([bash],
        [], [enable_bash=yes])
 AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
 
+AM_COND_IF([ENABLE_BASH],
+       [AC_MSG_CHECKING([bash completion directory])
+       PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
+               bashcompdir="${sysconfdir}/bash_completion.d")
+       AC_MSG_RESULT([$bashcompdir])
+       AC_SUBST(bashcompdir)
+       ])
+
 # Optional test binaries
 AC_ARG_ENABLE([tests],
        [AC_HELP_STRING([--enable-tests], [build test/example binaries [default=no]])],