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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit f95b74895882b5e2814b633204dc0b38b8f5ab8d
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Wed Jun 15 16:33:14 2011 +0100

    support POSIX make. removed Makefile.include

diff --git a/ChangeLog b/ChangeLog
index b62fe84..63039f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,19 @@
 2011-06-15  Ian Beckwith  <ianb at erislabs.net>
 
 	* scitopia, worldwidescience: fixed URLs.
+	* Fixed make portability problems.
+	  We cannot portably combine single suffix rules (foo.IN->foo)
+	  and separated dependencies so we have to explicitly specify
+	  all the .IN rules. The fix we used for this until now was
+	  specific to GNU make.
+	* Removed Makefile.include, no longer used.
 
 2011-06-14  Ian Beckwith  <ianb at erislabs.net>
 
 	* musicbrainz, codesearch, rpmsearch: Fixed URLs, options and
 	  tests. The sites have all changed significantly which means
 	  both new options and no-longer-supported options.
-	  codesearch has gone all ajaxy, so I've implemented the options
+	  Codesearch has gone all ajaxy, so I've implemented the options
 	  via the search string, e.g. adding " package:foo".
 	  Disabled codesearch.test, as it now needs javascript.
 	  Codesearch on both google.com and google.co.uk was acting up,
diff --git a/Makefile.am b/Makefile.am
index 49dacb2..7143d0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ if OPENSEARCH
 man_MANS += opensearch-discover.1 opensearch-genquery.1
 endif
 EXTRA_DIST	= surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
-                  surfraw.spec.in aclocal.m4 HACKING Makefile.include \
+                  surfraw.spec.in aclocal.m4 HACKING  \
 		  surfraw.1.IN elvi.1sr.IN surfraw.bookmarks links.IN \
 		  surfraw-bash-completion.IN surfraw.conf.IN \
 		  $(devel_extra)
@@ -22,26 +22,61 @@ CLEANFILES = surfraw surfraw-update-path surfraw-update-path.1 surfraw.spec surf
 
 BUILT_SOURCES = surfraw.conf
 
+# we cannot portably combine single suffix rules and separated dependencies
+# so we have to explicitly specify all the .IN rules
+
 surfraw: surfraw.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at VERSION\@,${VERSION},g; '\
+	    -e 's, at ELVIDIR\@,${ELVIDIR},g; '\
+	    -e 's, at AWK\@,${AWK},g; '\
+	    -e 's, at sysconfdir\@,${sysconfdir},g ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 surfraw.conf: surfraw.conf.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at prefix\@,${prefix},g; '\
+	    -e 's, at TEXTBROWSER\@,${TEXTBROWSER},g; '\
+	    -e 's, at GRAPHICALBROWSER\@,${GRAPHICALBROWSER},g; ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 surfraw-update-path: surfraw-update-path.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 surfraw-bash-completion: surfraw-bash-completion.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 elvi.1sr: elvi.1sr.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 surfraw.1: surfraw.1.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; '\
+	    -e 's, at sysconfdir\@,${sysconfdir},g' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
+
+links: links.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at mandir\@,${mandir},g; ' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
 surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
 	-rm -f $@
 	pod2man $< > $@
 
-links: links.IN
-
-include $(top_srcdir)/Makefile.include
-
 install-data-hook: links
 	chmod -x surfraw.conf elvi.1sr surfraw.1
 	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
diff --git a/Makefile.include b/Makefile.include
deleted file mode 100644
index 6afbbe6..0000000
--- a/Makefile.include
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-%: %.IN
-	-rm -f $@ $@.tmp
-	sed -e 's, at bindir\@,${bindir},g; '\
-	    -e 's, at mandir\@,${mandir},g; '\
-	    -e 's, at VERSION\@,${VERSION},g; '\
-	    -e 's, at prefix\@,${prefix},g; '\
-	    -e 's, at ELVIDIR\@,${ELVIDIR},g; '\
-	    -e 's, at AWK\@,${AWK},g; '\
-	    -e 's, at TEXTBROWSER\@,${TEXTBROWSER},g; '\
-	    -e 's, at GRAPHICALBROWSER\@,${GRAPHICALBROWSER},g; '\
-	    -e 's, at sysconfdir\@,${sysconfdir},g' $< >$@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
-
diff --git a/NEWS b/NEWS
index f8f546b..6d814d3 100644
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,7 @@ Tue Jun 14 05:02:11 BST 2011  - surfraw 2.2.8
 	* Default to surfraw_graphical_remote=no,
 	  as chromium doesn't support "-remote openURL".
 	* Bookmark names are now an exact match not a substring match.
+	* Support BSD/POSIX make.
 	* README: added INTEGRATION section on uzbl and pentadactyl.
 
 Thu May  6 20:20:09 BST 2010  - surfraw 2.2.7
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 04653b0..1be6703 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,5 +3,8 @@ EXTRA_DIST     = README uzbl_load_url_from_surfraw.IN
 CLEANFILES     = uzbl_load_url_from_surfraw
 
 uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
+	-rm -f $@ $@.tmp
+	sed -e 's, at AWK\@,${AWK},g;' $< >$@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
 
-include $(top_srcdir)/Makefile.include

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