[Surfraw-devel] The elvi list isn't a config file, and shouldn't be treated as such.

[James Rowe]

  Other than display by `surfraw -elvi' surfraw_elvi.list isn't used,
adding/subtracting/deleting doesn't change operation of the tool.  It
shouldn't be stored in /etc.

  This patch just moves it in to the elvi dir.

  I suppose some argument could be made for creating a new target category,
if you're installing elvi in to /usr/lib so the list file is installed in to
/usr/share.  I'll rework it if there is some consensus this way, but
honestly I don't believe elvi should be in /usr/lib in the first place
and it would add needless complexity.

Thanks for your time


Jay

Index: surfraw/elvi/Makefile.am
===================================================================
--- surfraw/elvi/Makefile.am	{cset 2067dc1d-7db0-4917-a323-4fa18cf656a9}
+++ surfraw/elvi/Makefile.am	{local clone}
@@ -72,7 +72,7 @@ elvi_SCRIPTS	= \
 		  yahoo \
           yubnub
 
-sysconf_DATA	= surfraw_elvi.list
+elvi_DATA	= surfraw_elvi.list
 
 EXTRA_DIST	= $(elvi_SCRIPTS)
 
Index: surfraw/surfraw.1.IN
===================================================================
--- surfraw/surfraw.1.IN	{cset 4a7c02de-088d-48e0-a0af-216803e6f9f2}
+++ surfraw/surfraw.1.IN	{local clone}
@@ -309,7 +309,7 @@ File containing list of elvi
 
 Default:
 
- def SURFRAW_elvi_list @sysconfdir@/surfraw_elvi.list
+ def SURFRAW_elvi_list @ELVIDIR@/surfraw_elvi.list
 
 
 .SH FILES
@@ -336,7 +336,7 @@ System wide bookmarks file.
 Per-user bookmarks file.
 
 .TP
-.B @sysconfdir@/surfraw_elvi.list
+.B @ELVIDIR@/surfraw_elvi.list
 List of all elvi.
 
 .SH BUGS
Index: surfraw/surfraw.conf.IN
===================================================================
--- surfraw/surfraw.conf.IN	{cset 59711bc6-6cba-4054-a68d-e211fd0d7511}
+++ surfraw/surfraw.conf.IN	{local clone}
@@ -83,4 +83,4 @@ def   SURFRAW_results		30
 defyn SURFRAW_escape_url_args	yes
 
 # file containing list of elvi
-def   SURFRAW_elvi_list		@sysconfdir@/surfraw_elvi.list
+def   SURFRAW_elvi_list		@ELVIDIR@/surfraw_elvi.list