---
 Makefile.am             | 13 ++++++++++---
 configure.ac            |  3 +++
 doc/mpc-completion.bash |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1567ba9..24c060d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,16 @@ AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 
 man_MANS = doc/mpc.1
 doc_DATA = AUTHORS COPYING NEWS README \
-       doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit \
-       doc/mpc-completion.bash
-EXTRA_DIST = $(man_MANS) $(doc_DATA)
+       doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit
+bashcompdir = @bashcompdir@
+bashcomp_DATA = doc/mpc-completion.bash
+EXTRA_DIST = $(man_MANS) $(doc_DATA) $(bashcomp_DATA)
+
+install-data-hook:
+       mv $(DESTDIR)$(bashcompdir)/mpc-completion.bash \
+          $(DESTDIR)$(bashcompdir)/mpc
+uninstall-hook:
+       $(RM) $(DESTDIR)$(bashcompdir)/mpc
 
 bin_PROGRAMS = src/mpc
 
diff --git a/configure.ac b/configure.ac
index 28a9c5e..c413bd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,9 @@ fi
 
 AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes)
 
+PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
+    bashcompdir="${sysconfdir}/bash_completion.d")
+AC_SUBST(bashcompdir)
 
 dnl
 
diff --git a/doc/mpc-completion.bash b/doc/mpc-completion.bash
index 6d0bb1e..0a2d3db 100644
--- a/doc/mpc-completion.bash
+++ b/doc/mpc-completion.bash
@@ -1,5 +1,5 @@
 # Installation:
-# - If you have system bash completion, place this in /etc/bash_completion.d or
+# - If you have system bash completion, place this in its completions dir or
 #   source it from $HOME/.bash_completion
 # - If you don't have system bash completion, source this from your .bashrc
 
-- 
1.9.3

_______________________________________________
mpd-devel mailing list
[email protected]
http://mailman.blarg.de/listinfo/mpd-devel

Reply via email to