[oe-commits] Martin Jansa : Intone: Partially revert changes as they were applied upstream for rev > 64, make regexp for /usr/doc/intone -> /usr/share/doc/intone a bit safer

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 7494c539a16821b07bef61f6daa692b11544ff36
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7494c539a16821b07bef61f6daa692b11544ff36

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Sep 11 19:57:53 2009 +0000

Intone: Partially revert changes as they were applied upstream for rev > 64, make regexp for /usr/doc/intone -> /usr/share/doc/intone a bit safer

---

 recipes/intone/intone_svn.bb |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb
index c58a316..d8bd634 100644
--- a/recipes/intone/intone_svn.bb
+++ b/recipes/intone/intone_svn.bb
@@ -18,10 +18,7 @@ inherit autotools
 do_configure_prepend() {
 	rm -f "${S}/INSTALL"
 	touch "${S}/INSTALL"
-	sed -i 's/\/doc\/intone$/\/share\/doc\/intone/g' ${S}/Makefile.am
-	sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am
-	sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am
-	sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am
+	sed -i 's/{prefix}\/doc\/intone$/{prefix}\/share\/doc\/intone/g' ${S}/Makefile.am
 }
 
 do_install_append() {
@@ -30,7 +27,7 @@ do_install_append() {
 	mkdir -p "${D}/${datadir}/applications"
 	install -m 0644 "${S}/resources/intone.desktop" "${D}/${datadir}/applications"
 	mkdir -p "${D}/${datadir}/intone"
-	for ico in "${S}/resources/"*.png "${S}/resources/"*.jpg; do
+	for ico in "${S}/resources/"*.png; do
 		if [ "$(basename $ico)" != "intone.png" ]; then
 			install -m 0644 $ico "${D}/${datadir}/intone"
 		fi