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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 59e33f8b895488cee502a040f2def66f72ead254
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Fri Nov 6 14:51:11 2009 +0000

    Fix 'make distcheck':
    * Install surfraw.bookmarks from $(top_srcdir)
    * Fix CLEANFILES entries for surfraw-update-path and uzbl_load_url_from_surfraw

diff --git a/Makefile.am b/Makefile.am
index 5102cd3..3b80224 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ if OPENSEARCH
 dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 endif
 devel_extra	= banner prebuild
-noinst_DATA	= surfraw-bash-completion
+noinst_DATA	= surfraw-bash-completion surfraw.bookmarks
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
 if OPENSEARCH
 man_MANS += opensearch-discover.1 opensearch-genquery.1
@@ -45,7 +45,7 @@ install-data-hook: links surfraw.conf
 	chmod -x surfraw.conf elvi.1sr surfraw.1
 	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
 	cp surfraw.conf $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
-	cp surfraw.bookmarks $(DESTDIR)@sysconfdir@/xdg/surfraw/bookmarks
+	cp $(top_srcdir)/surfraw.bookmarks $(DESTDIR)@sysconfdir@/xdg/surfraw/bookmarks
 	while read target link ;\
 	do \
 		ln -sf $$target  $(DESTDIR)/$$link ;\
diff --git a/Makefile.in b/Makefile.in
index f948cf0..11adfa4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ SUBDIRS = elvi test examples
 bin_SCRIPTS = surfraw surfraw-update-path
 @OPENSEARCH_TRUE at dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 devel_extra = banner prebuild
-noinst_DATA = surfraw-bash-completion
+noinst_DATA = surfraw-bash-completion surfraw.bookmarks
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr $(am__append_1)
 EXTRA_DIST = surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
                   surfraw.spec.in aclocal.m4 HACKING Makefile.include \
@@ -863,7 +863,7 @@ install-data-hook: links surfraw.conf
 	chmod -x surfraw.conf elvi.1sr surfraw.1
 	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
 	cp surfraw.conf $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
-	cp surfraw.bookmarks $(DESTDIR)@sysconfdir@/xdg/surfraw/bookmarks
+	cp $(top_srcdir)/surfraw.bookmarks $(DESTDIR)@sysconfdir@/xdg/surfraw/bookmarks
 	while read target link ;\
 	do \
 		ln -sf $$target  $(DESTDIR)/$$link ;\
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7cf8706..04653b0 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
 noinst_SCRIPTS = uzbl_load_url_from_surfraw
 EXTRA_DIST     = README uzbl_load_url_from_surfraw.IN
-CLEANFILES     = examples/uzbl_load_url_from_surfraw
+CLEANFILES     = uzbl_load_url_from_surfraw
 
 uzbl_load_url_from_surfraw: uzbl_load_url_from_surfraw.IN
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 5a84ac2..25fb834 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -126,7 +126,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_SCRIPTS = uzbl_load_url_from_surfraw
 EXTRA_DIST = README uzbl_load_url_from_surfraw.IN
-CLEANFILES = examples/uzbl_load_url_from_surfraw
+CLEANFILES = uzbl_load_url_from_surfraw
 all: all-am
 
 .SUFFIXES:

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