[Surfraw-commits] [surfraw] 01/01: Revert "ng0's patch to include bash completions"

[jason ryan]

This is an automated email from the git hooks/post-receive script.

jasonwryan-guest pushed a commit to branch master
in repository surfraw.

commit 4a3c73fb42d9acaa43523c91851aba6c5d39f1cd
Author: Jason Ryan <jasonwryan at gmail.com>
Date:   Fri Feb 2 20:31:51 2018 +1300

    Revert "ng0's patch to include bash completions"
    
    This reverts commit ad8e7d2547b2263992afff2f14eef45bac0afe9c.
---
 Makefile.am  | 16 +++-------------
 configure.in |  7 -------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9192bff..0141193 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,7 @@ if OPENSEARCH
 dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 endif
 devel_extra	= banner prebuild
-if BASHCOMPLETIONS
-noinst_DATA	= surfraw.bookmarks
-else
-noinst_DATA	= surfraw.bookmarks surfraw-bash-completion
-endif
+noinst_DATA	= surfraw-bash-completion surfraw.bookmarks
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
 if OPENSEARCH
 man_MANS += opensearch-discover.1 opensearch-genquery.1
@@ -95,7 +91,7 @@ opensearch-genquery.1: opensearch-genquery
 	-rm -f $@
 	pod2man $? > $@
 
-install-data-hook: links surfraw-bash-completion
+install-data-hook: links
 	chmod -x surfraw.conf elvi.1sr surfraw.1
 	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
 	cp surfraw.conf $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
@@ -108,10 +104,6 @@ if INSTALLSR
 	ln -sf surfraw $(DESTDIR)/@bindir@/sr
 	ln -sf surfraw.1.gz $(DESTDIR)/@mandir@/man1/sr.1.gz
 endif
-if BASHCOMPLETIONS
-	mkdir -p $(DESTDIR)@sysconfdir@/bash_completion.d
-	@cp surfraw-bash-completion $(DESTDIR)@sysconfdir@/bash_completion.d/surfraw
-endif
 
 uninstall-local: links
 	-rm -f $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
@@ -126,9 +118,7 @@ if INSTALLSR
 	rm -f $(DESTDIR)/@bindir@/sr
 	rm -f $(DESTDIR)/@mandir@/man1/sr.1.gz
 endif
-if BASHCOMPLETIONS
-	-rm -f $(DESTDIR)@sysconfdir@/bash_completion.d/surfraw
-endif
+
 
 submit-lsm: surfraw.lsm
 	mail -s add LSM at qqx.org < $?
diff --git a/configure.in b/configure.in
index 9dd99ce..7dbe05d 100644
--- a/configure.in
+++ b/configure.in
@@ -18,13 +18,6 @@ AC_ARG_ENABLE([opensearch],
 AC_MSG_RESULT([$enable_opensearch])
 AM_CONDITIONAL(OPENSEARCH, test "$enable_opensearch" = "yes")
 
-AC_MSG_CHECKING([wether to install Bash completions])
-AC_ARG_ENABLE([bash-completions],
-        [AS_HELP_STRING([--disable-bash-completions], [disable Bash completions support])],,
-        [enable_bashcompletions=yes])
-AC_MSG_RESULT([$enable_bashcompletions])
-AM_CONDITIONAL(BASHCOMPLETIONS, test "$enable_bashcompletions" = "yes")
-
 AC_MSG_CHECKING([whether to install sr alias])
 AC_ARG_ENABLE([sr],
 	[AS_HELP_STRING([--disable-sr], [disable sr alias])],,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/surfraw/surfraw.git