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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit e916d4d3e852288a58dfc82a13db1501ed41cb30
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Thu Jun 16 00:59:12 2011 +0100

    fix more make(1) portability problems

diff --git a/ChangeLog b/ChangeLog
index 0c32e22..13f1369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-16  Ian Beckwith  <ianb at erislabs.net>
+
+	* Fix more make(1) portability problems.
+	  Either I am horribly confused or netbsd make
+	  (or at least pmake in debian) doesn't support '$<'.
+	  Bodged around it in mildly horrible ways.
+
 2011-06-15  Ian Beckwith  <ianb at erislabs.net>
 
 	* scitopia, worldwidescience: fixed URLs.
diff --git a/Makefile.am b/Makefile.am
index faa1836..ae03c84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ surfraw: surfraw.IN
 	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
+	    -e 's, at sysconfdir\@,${sysconfdir},g ' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
@@ -38,44 +38,52 @@ 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
+	    -e 's, at GRAPHICALBROWSER\@,${GRAPHICALBROWSER},g; ' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 surfraw-update-path: surfraw-update-path.IN
 	-rm -f $@ $@.tmp
-	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 surfraw-bash-completion: surfraw-bash-completion.IN
 	-rm -f $@ $@.tmp
-	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 elvi.1sr: elvi.1sr.IN
 	-rm -f $@ $@.tmp
-	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $< >$@.tmp
+	sed -e 's, at ELVIDIR\@,${ELVIDIR},g; ' $@.IN >$@.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
+	    -e 's, at sysconfdir\@,${sysconfdir},g' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
 links: links.IN
 	-rm -f $@ $@.tmp
-	sed -e 's, at mandir\@,${mandir},g; ' $< >$@.tmp
+	sed -e 's, at mandir\@,${mandir},g; ' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-surfraw-update-path.1 opensearch-discover.1 opensearch-genquery.1: %.1: %
+surfraw-update-path.1: surfraw-update-path
 	-rm -f $@
-	pod2man $< > $@
+	pod2man `basename $@ .1` > $@
+
+ opensearch-discover.1: opensearch-discover
+	-rm -f $@
+	pod2man `basename $@ .1` > $@
+
+opensearch-genquery.1: opensearch-genquery
+	-rm -f $@
+	pod2man `basename $@ .1` > $@
 
 install-data-hook: links
 	chmod -x surfraw.conf elvi.1sr surfraw.1
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1be6703..41d0121 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,7 +4,7 @@ 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
+	sed -e 's, at AWK\@,${AWK},g;' $@.IN >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 

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