[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-36-gc6f38b1

[Ian Beckwith]

The following commit has been merged in the master branch:
commit c6f38b149b2d36bb6eb49b6d501d702e885ed5a7
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Fri Nov 6 04:10:00 2009 +0000

    examples/uzbl_load_url_from_surfraw: Add '.IN' suffix and dependency
    so correct value of @AWK@ is picked up from ./configure.
    (preceding two commits also refer to examples/uzbl_load_url_from_surfraw)

diff --git a/.gitignore b/.gitignore
index b63597c..9c14222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@ surfraw.conf
 surfraw.lsm
 surfraw.spec
 test/Makefile
-
+examples/uzbl_load_url_from_surfraw
diff --git a/ChangeLog b/ChangeLog
index 7a35c0e..49f07c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	    available.
 	  + present_menu(): use awk(1) instead of cut(1), so tabs in
 	    bookmark files are handled correctly.
+	  + Add '.IN' suffix and dependency so correct value of @AWK@
+	    is picked up from ./configure.
 
 2009-10-27  Ian Beckwith  <ianb at erislabs.net>
 
diff --git a/Makefile.am b/Makefile.am
index b462f6d..8fa5d6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,12 @@
 SUBDIRS		= elvi test
 
 bin_SCRIPTS = surfraw surfraw-update-path
+noinst_SCRIPTS = examples/uzbl_load_url_from_surfraw
 if OPENSEARCH
 dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 endif
 devel_extra	= banner prebuild
-examples_extra  = examples/README examples/uzbl_load_url_from_surfraw
+examples_extra  = examples/README examples/uzbl_load_url_from_surfraw.IN
 noinst_DATA	= surfraw-bash-completion
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
 if OPENSEARCH
@@ -20,7 +21,8 @@ EXTRA_DIST	= surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
 
 CLEANFILES = surfraw surfraw-update-path surfraw-update-path.1 surfraw.spec surfraw.lsm \
 		surfraw.1 elvi.1sr links surfraw-bash-completion surfraw.conf surfraw.1 \
-		elvi.1sr opensearch-discover.1 opensearch-genquery.1
+		elvi.1sr opensearch-discover.1 opensearch-genquery.1 \
+		examples/uzbl_load_url_from_surfraw
 
 surfraw: surfraw.IN
 
@@ -34,6 +36,8 @@ elvi.1sr: elvi.1sr.IN
 
 surfraw.1: surfraw.1.IN
 
+uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
+
 surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
 	-rm -f $@
 	pod2man $< > $@
diff --git a/Makefile.in b/Makefile.in
index d4f7a68..c21535b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 am__dist_bin_SCRIPTS_DIST = opensearch-discover opensearch-genquery
-SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS) $(noinst_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -214,9 +214,10 @@ top_srcdir = @top_srcdir@
 # $Id$
 SUBDIRS = elvi test
 bin_SCRIPTS = surfraw surfraw-update-path
+noinst_SCRIPTS = examples/uzbl_load_url_from_surfraw
 @OPENSEARCH_TRUE at dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 devel_extra = banner prebuild
-examples_extra = examples/README examples/uzbl_load_url_from_surfraw
+examples_extra = examples/README examples/uzbl_load_url_from_surfraw.IN
 noinst_DATA = surfraw-bash-completion
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr $(am__append_1)
 EXTRA_DIST = surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
@@ -227,7 +228,8 @@ EXTRA_DIST = surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
 
 CLEANFILES = surfraw surfraw-update-path surfraw-update-path.1 surfraw.spec surfraw.lsm \
 		surfraw.1 elvi.1sr links surfraw-bash-completion surfraw.conf surfraw.1 \
-		elvi.1sr opensearch-discover.1 opensearch-genquery.1
+		elvi.1sr opensearch-discover.1 opensearch-genquery.1 \
+		examples/uzbl_load_url_from_surfraw
 
 all: all-recursive
 
@@ -840,6 +842,8 @@ elvi.1sr: elvi.1sr.IN
 
 surfraw.1: surfraw.1.IN
 
+uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
+
 surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
 	-rm -f $@
 	pod2man $< > $@
diff --git a/examples/uzbl_load_url_from_surfraw b/examples/uzbl_load_url_from_surfraw.IN
similarity index 100%
rename from examples/uzbl_load_url_from_surfraw
rename to examples/uzbl_load_url_from_surfraw.IN

-- 
surfraw -  a fast unix command line interface to WWW