sylpheed_1.9.12.bb : Proper fix for the /usr/include problem, this time

patched out the bug in Makefile.am

diff --git a/packages/sylpheed/files/Makefile-am.patch b/packages/sylpheed/files/Makefile-am.patch
new file mode 100644 (file)
index 0000000..d1fb09f
--- /dev/null
+++ b/packages/sylpheed/files/Makefile-am.patch
@@ -0,0 +1,12 @@
+--- sylpheed-1.9.12/src/Makefile.am.orig       2006-01-16 13:14:05.000000000 +0000
++++ sylpheed-1.9.12/src/Makefile.am    2006-01-16 13:14:19.000000000 +0000
+@@ -177,8 +177,7 @@
+       -DG_LOG_DOMAIN=\"Sylpheed\" \
+       $(GTK_CFLAGS) \
+       $(GDK_PIXBUF_CFLAGS) \
+-      $(GPGME_CFLAGS) \
+-      -I$(includedir)
++      $(GPGME_CFLAGS)
+ 
+ sylpheed_LDADD = \
+       $(INTLLIBS) \

diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb
index a6b8cb1..b02aead 100644 (file)
--- a/packages/sylpheed/sylpheed_1.9.12.bb
+++ b/packages/sylpheed/sylpheed_1.9.12.bb
@@ -3,15 +3,16 @@ DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \
-       file://sylpheed-gnutls.patch;patch=1"
+       file://sylpheed-gnutls.patch;patch=1 \
+       file://Makefile-am.patch;patch=1"
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
 
-EXTRA_OECONF = "--enable-gnutls --includedir=${STAGING_INCDIR}"
+EXTRA_OECONF = "--enable-gnutls"
 
 CFLAGS += "-D_GNU_SOURCE"