[Surfraw-devel] the `W' command is an elvi file, and should be in the elvi dir

[James Rowe]

  Everything about the W command says it is an elvi, but it installed in
$prefix/bin.

  This patch just moves it in to the elvi dir, which also means it will be
included in the output of surfraw -elvi.  Also the W man page is now a link
to the elvi man page instead of the main surfraw man page.

  There is a secondary reason for this change, there has been a long standing
bug[1] in the Gentoo BTS against surfraw and its use on Mac OS.  The basic
issue is the lack of case sensitivity on some Mac OS installs which means
W clashes with the system provided w command.  This change will allow future
releases to receive the macos keyword :)

Thanks for your time


Jay

1.  http://bugs.gentoo.org/show_bug.cgi?id=58955

Index: surfraw/elvi/Makefile.am
===================================================================
--- surfraw/elvi/Makefile.am	{cset eddccb3b-a859-4f19-a60a-5b1e276b6799}
+++ surfraw/elvi/Makefile.am	{local clone}
@@ -2,6 +2,7 @@
 elvidir=$(ELVIDIR)
 
 elvi_SCRIPTS	= \
+		  W \
 		  alioth \
 		  altavista \
 		  amazon \
Index: surfraw/elvi/W
===================================================================
--- /dev/null	{cset 874523cf-887f-4577-a97b-3adc4b72a0f8}
+++ surfraw/elvi/W	{local clone}
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $Id: W,v 1.2 2004/02/06 00:31:05 ianb-guest Exp $
+# elvis: W		-- Activate Surfraw defined web-browser
+. surfraw || exit 1
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [browser-options] url
+Description:
+  Surfraw activate the currently configured web-browser ($SURFRAW_browser)
+EOF
+    w3_global_usage
+}
+
+w3_config
+w3_parse_args "$@"
+w3_browse_url "$w3_args"
Index: surfraw/links.IN
===================================================================
--- surfraw/links.IN	{cset bd7c395a-e6c5-4651-ae35-eb2965160b6e}
+++ surfraw/links.IN	{local clone}
@@ -1,6 +1,6 @@
 surfraw @bindir@/sr
 surfraw.1.gz @mandir@/man1/sr.1.gz
-surfraw.1.gz @mandir@/man1/W.1.gz
+elvi.1sr.gz @mandir@/man1/W.1.gz
 elvi.1sr.gz @mandir@/man1/alioth.1sr.gz
 elvi.1sr.gz @mandir@/man1/altavista.1sr.gz
 elvi.1sr.gz @mandir@/man1/amazon.1sr.gz
Index: surfraw/Makefile.am
===================================================================
--- surfraw/Makefile.am	{cset 3d156099-8911-41be-9ae3-b15afdf4ae9f}
+++ surfraw/Makefile.am	{local clone}
@@ -1,14 +1,14 @@
 # $Id: Makefile.am,v 1.4 2006/04/26 15:11:21 ianb-guest Exp $
 SUBDIRS		= elvi
 
-bin_SCRIPTS	= surfraw surfraw-update-path W
+bin_SCRIPTS	= surfraw surfraw-update-path
 sysconf_DATA	= surfraw.conf surfraw.bookmarks
 devel_extra	= banner prebuild
 noinst_DATA	= surfraw-bash-completion
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
 EXTRA_DIST	= surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
                   surfraw.spec.in aclocal.m4 HACKING Makefile.include \
-				  surfraw.1.IN elvi.1sr.IN W surfraw.bookmarks links.IN \
+				  surfraw.1.IN elvi.1sr.IN surfraw.bookmarks links.IN \
 				  debian/README.Debian debian/changelog debian/compat \
 				  debian/control debian/copyright \
 				  debian/docs debian/linda.overrides \
Index: surfraw/W
===================================================================
--- surfraw/W	{cset 55152d84-e20c-43a8-8f31-6ab653e49621}
+++ /dev/null	{local clone}
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: W,v 1.2 2004/02/06 00:31:05 ianb-guest Exp $
-# elvis: W		-- Activate Surfraw defined web-browser
-. surfraw || exit 1
-
-w3_usage_hook () {
-    cat <<EOF
-Usage: $w3_argv0 [options] [browser-options] url
-Description:
-  Surfraw activate the currently configured web-browser ($SURFRAW_browser)
-EOF
-    w3_global_usage
-}
-
-w3_config
-w3_parse_args "$@"
-w3_browse_url "$w3_args"