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
This commit is contained in:
parent
155ecc11f3
commit
b0a20fa7ca
|
@ -839,6 +839,10 @@ if test "${enable_cryptotokenkit}" = "yes"; then
|
||||||
fi
|
fi
|
||||||
AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled])
|
AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled])
|
||||||
fi
|
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)
|
AC_SUBST(DYN_LIB_EXT)
|
||||||
|
|
|
@ -15,7 +15,6 @@ man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml))
|
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)
|
tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml)
|
||||||
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
|
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
|
||||||
|
|
Loading…
Reference in New Issue