diff options
| author | Guillaume Rousse <Guillaume.Rousse@inria.fr> | 2010-09-12 16:40:04 +0200 |
|---|---|---|
| committer | Guillaume Rousse <Guillaume.Rousse@inria.fr> | 2010-09-12 16:40:04 +0200 |
| commit | 276e3a780ec48fe1577c45e73d62bc68c70b1c00 (patch) | |
| tree | f37bd5b96cd7d4b634814735a406684483f5f254 | |
| parent | c85a8b9a3e36beabb3c95ff36404aaee71de878f (diff) | |
| download | bash-completion-276e3a780ec48fe1577c45e73d62bc68c70b1c00.tar.gz | |
use BASH_COMPLETION_DIR for locating helpers, avoiding the use of an install-time substitution
| -rw-r--r-- | contrib/Makefile.am | 15 | ||||
| -rw-r--r-- | contrib/perl (renamed from contrib/perl.in) | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b3aea2d9..86f62251 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -static_bashcomp = abook \ +bashcomp_DATA = abook \ ant \ apache2ctl \ apt \ @@ -101,6 +101,7 @@ static_bashcomp = abook \ openldap \ openssl \ p4 \ + perl \ pine \ pkg-config \ pkg_install \ @@ -167,15 +168,5 @@ static_bashcomp = abook \ yp-tools \ yum-arch -generated_bashcomp = perl - -bashcomp_DATA = $(static_bashcomp) $(generated_bashcomp) - -perl: perl.in Makefile - sed -e 's|@helpersdir[@]|$(helpersdir)|' <$(srcdir)/$@.in >$@ - -EXTRA_DIST = $(bashcomp_DATA) perl.in \ +EXTRA_DIST = $(bashcomp_DATA) \ _mock _modules _subversion _yum _yum-utils - -CLEANFILES = perl - diff --git a/contrib/perl.in b/contrib/perl index 8fb7f5cf..ea71b2f4 100644 --- a/contrib/perl.in +++ b/contrib/perl @@ -49,7 +49,7 @@ _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: |