use BASH_COMPLETION_DIR for locating helpers, avoiding the use of an install-time substitution

This commit is contained in:
Guillaume Rousse 2010-09-12 16:40:04 +02:00
parent c85a8b9a3e
commit 276e3a780e
2 changed files with 4 additions and 13 deletions

View File

@ -1,4 +1,4 @@
static_bashcomp = abook \ bashcomp_DATA = abook \
ant \ ant \
apache2ctl \ apache2ctl \
apt \ apt \
@ -101,6 +101,7 @@ static_bashcomp = abook \
openldap \ openldap \
openssl \ openssl \
p4 \ p4 \
perl \
pine \ pine \
pkg-config \ pkg-config \
pkg_install \ pkg_install \
@ -167,15 +168,5 @@ static_bashcomp = abook \
yp-tools \ yp-tools \
yum-arch yum-arch
generated_bashcomp = perl EXTRA_DIST = $(bashcomp_DATA) \
bashcomp_DATA = $(static_bashcomp) $(generated_bashcomp)
perl: perl.in Makefile
sed -e 's|@helpersdir[@]|$(helpersdir)|' <$(srcdir)/$@.in >$@
EXTRA_DIST = $(bashcomp_DATA) perl.in \
_mock _modules _subversion _yum _yum-utils _mock _modules _subversion _yum _yum-utils
CLEANFILES = perl

View File

@ -49,7 +49,7 @@ _perl()
} }
complete -F _perl -o nospace -o filenames perl complete -F _perl -o nospace -o filenames perl
complete -C @helpersdir@/perldoc -o nospace -o default perldoc complete -C $BASH_COMPLETION_DIR/helpers/perldoc -o nospace -o default perldoc
} }
# Local variables: # Local variables: