Skip to content

Commit

Permalink
install bash completion where pkg-config tells us to
Browse files Browse the repository at this point in the history
Signed-off-by: Evgeni Golov <evgeni@debian.org>
  • Loading branch information
evgeni committed Nov 12, 2016
1 parent f3d7477 commit 23f4c8a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
11 changes: 1 addition & 10 deletions 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
8 changes: 8 additions & 0 deletions configure.ac
Expand Up @@ -479,6 +479,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]])],
Expand Down

0 comments on commit 23f4c8a

Please sign in to comment.