From 85ec51fcc2951a8bf16d2ebff852e200b0a8d3db Mon Sep 17 00:00:00 2001 From: Dominik Taborsky Date: Tue, 26 May 2015 15:23:14 +0200 Subject: [PATCH] makefile: install bash completion script for keymgr to correct location. --- configure.ac | 4 ++++ samples/Makefile.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 05edb0911..df7368805 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,10 @@ AC_SUBST([libzscanner_VERSION_INFO],["-version-info 0:1:0"]) release_date=$(sed -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS) AC_SUBST([RELEASE_DATE], $release_date) +# Get Bash completion scripts directory +bash_completion_dir=$(pkg-config --variable=completionsdir bash-completion) +AC_SUBST([BASH_COMPLETION_DIR], $bash_completion_dir) + # Set compiler compatibility flags AC_PROG_CC_C99 AM_PROG_CC_C_O diff --git a/samples/Makefile.am b/samples/Makefile.am index 28ad67f7d..105be41f5 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -24,9 +24,9 @@ install-data-local: knot.sample.conf $(INSTALL) -d $(DESTDIR)/$(config_dir); \ $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \ fi - if [ \! -f $(DESTDIR)/$(sysconfdir)/bash_completion.d/keymgr ]; then \ - $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d; \ - $(INSTALL_DATA) $(srcdir)/keymgr-completion.sh $(DESTDIR)/$(sysconfdir)/bash_completion.d/keymgr; \ + if [ \! -f $(BASH_COMPLETION_DIR)/keymgr ]; then \ + $(INSTALL) -d $(BASH_COMPLETION_DIR); \ + $(INSTALL_DATA) $(srcdir)/keymgr-completion.sh $(BASH_COMPLETION_DIR)/keymgr; \ fi uninstall-local: