forked from pool/opensc
Stanislav Brabec
defc0af54f
- Add missing patch to changes. OBS-URL: https://build.opensuse.org/package/show/security:chipcard/opensc?expand=0&rev=53
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From b0a20fa7ca30dc6c6198954fadc5a7fe812834dc Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Brabec <sbrabec@suse.com>
|
|
Date: Fri, 22 Jun 2018 16:38:38 +0200
|
|
Subject: [PATCH] Use correct bash-completion path
|
|
|
|
Recent versions of bash is leaving /etc/bash_completion.d. The correct
|
|
directory is specified by pkg-config --variable completionsdir
|
|
bash-completion.
|
|
|
|
Fixes https://github.com/OpenSC/OpenSC/issues/1403
|
|
---
|
|
configure.ac | 4 ++++
|
|
doc/tools/Makefile.am | 1 -
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 700b14dc..6abad0b7 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -839,6 +839,10 @@ if test "${enable_cryptotokenkit}" = "yes"; then
|
|
fi
|
|
AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled])
|
|
fi
|
|
+PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
|
|
+ [completiondir="`pkg-config --variable=completionsdir bash-completion`"],
|
|
+ [completiondir="${sysconfdir}/bash_completion.d"])
|
|
+AC_SUBST([completiondir])
|
|
|
|
|
|
AC_SUBST(DYN_LIB_EXT)
|
|
diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
|
|
index 17e4fbf1..4e2d941c 100644
|
|
--- a/doc/tools/Makefile.am
|
|
+++ b/doc/tools/Makefile.am
|
|
@@ -15,7 +15,6 @@ man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml))
|
|
endif
|
|
|
|
completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml))
|
|
-completiondir = $(sysconfdir)/bash_completion.d
|
|
|
|
tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml)
|
|
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
|
|
--
|
|
2.18.0
|
|
|