gcalctool: do not use includedir as this break on cross builds

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1453 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gcalctool/gcalctool/fix-includedir.patch b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
new file mode 100644 (file)
index 0000000..62b386b
--- /dev/null
+++ b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
@@ -0,0 +1,12 @@
+Index: gcalctool-5.7.32/gcalctool/Makefile.am
+===================================================================
+--- gcalctool-5.7.32.orig/gcalctool/Makefile.am        2007-04-07 19:44:00.000000000 +0200
++++ gcalctool-5.7.32/gcalctool/Makefile.am     2007-04-07 19:44:15.000000000 +0200
+@@ -1,7 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = \
+-      -I$(includedir) \
+       -DG_DISABLE_DEPRECATED \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED \

diff --git a/meta/packages/gcalctool/gcalctool_5.7.32.bb b/meta/packages/gcalctool/gcalctool_5.7.32.bb
index 084b5e4c82283a3faf60f1185d155f56bb545b07..f12e6c402ad46cbfc20079a8baf5099f400a7f0d 100644 (file)
--- a/meta/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/meta/packages/gcalctool/gcalctool_5.7.32.bb
@@ -2,10 +2,11 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "gtk+"
 DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
-        file://makefile-fix.diff;patch=1"
+        file://makefile-fix.diff;patch=1\
+       file://fix-includedir.patch;patch=1"
 
 inherit autotools pkgconfig