The following commit has been merged in the master branch:
commit 276e3a780ec48fe1577c45e73d62bc68c70b1c00
Author: Guillaume Rousse <[email protected]>
Date: Sun Sep 12 16:40:04 2010 +0200
use BASH_COMPLETION_DIR for locating helpers, avoiding the use of an
install-time substitution
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b3aea2d..86f6225 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|@helpersd...@]|$(helpersdir)|' <$(srcdir)/[email protected] >$@
-
-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
similarity index 95%
rename from contrib/perl.in
rename to contrib/perl
index 8fb7f5c..ea71b2f 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:
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits
