Fix perldoc completions to run without invoking autotools

Alioth #312729 See also: http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg02143.html
2010-10-31 23:20:19 +01:00 · 2010-10-31 23:20:19 +01:00 · ef8b4f2722
commit ef8b4f2722
parent ec82c536ed
6 changed files with 3 additions and 9 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = completions helpers test
+SUBDIRS = completions test

 sysconf_DATA = bash_completion

--- a/completions/helpers/Makefile.am
+++ b/completions/helpers/Makefile.am
--- a/completions/helpers/perldoc
+++ b/completions/helpers/perldoc
--- a/completions/perl
+++ b/completions/perl
@ -49,7 +49,7 @@ _perl()
 }
 complete -F _perl -o nospace -o filenames perl

-complete -C $BASH_COMPLETION_DIR/helpers/perldoc -o nospace -o default perldoc
+complete -C ${BASH_SOURCE[0]%/*}/helpers/perldoc -o nospace -o default perldoc
 }

 # Local variables:
--- a/configure.ac
+++ b/configure.ac
@ -3,5 +3,5 @@ AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
-AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
 AC_OUTPUT
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@ -11,12 +11,6 @@ proc teardown {} {
 setup


-assert_complete_any "perldoc -"
-
-
-sync_after_int
-
-
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"