wview: removed /usr/include from list of include dirs

diff --git a/packages/wview/files/.mtn2git_empty b/packages/wview/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wview/files/Makefile.am.patch b/packages/wview/files/Makefile.am.patch
new file mode 100644 (file)
index 0000000..1c35ee8
--- /dev/null
+++ b/packages/wview/files/Makefile.am.patch
@@ -0,0 +1,24 @@
+--- wview-3.1.3/wunderground/Makefile.am.orig  2006-07-01 18:28:45.000000000 +0200
++++ wview-3.1.3/wunderground/Makefile.am       2006-07-01 18:29:23.000000000 +0200
+@@ -9,8 +9,6 @@
+ INCLUDES = \
+               -I$(top_srcdir)/common \
+               -I$(prefix)/include \
+-              -I/usr/include \
+-              -I/usr/local/include \
+               -D_GNU_SOURCE \
+               -DBUILD_WVWUNDERGROUND
+ 
+@@ -36,10 +34,10 @@
+ endif
+ 
+ # define library directories
+-wvwunderd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
++wvwunderd_LDFLAGS = -L$(prefix)/lib
+ 
+ if DB_MYSQL
+-wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql -L/usr/lib/mysql
++wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql
+ else
+ if DB_PGRESQL
+ wvwunderd_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib

diff --git a/packages/wview/wview-common.inc b/packages/wview/wview-common.inc
index 0efeee2..0df0707 100644 (file)
--- a/packages/wview/wview-common.inc
+++ b/packages/wview/wview-common.inc
@@ -5,13 +5,14 @@ MAINTAINER = "Mark Teel (mark@teel.ws)"
 HOMEPAGE = "http://www.wviewweather.com/"
 DEPENDS += " bash util-linux gd openssl curl update-rc.d"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz \
+       file://Makefile.am.patch;patch=1"
 
 S = "${WORKDIR}/wview-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF += " --enable-wunderground" 
+EXTRA_OECONF += "--prefix=${D} --enable-wunderground" 
 
 do_install_append() {
        install -d ${D}/${sysconfdir}/init.d

diff --git a/packages/wview/wview-sim_3.1.3.bb b/packages/wview/wview-sim_3.1.3.bb
index 919e322..3f07aec 100644 (file)
--- a/packages/wview/wview-sim_3.1.3.bb
+++ b/packages/wview/wview-sim_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-sim"
-PR = "r0"
+PR = "r1"

diff --git a/packages/wview/wview-vpro_3.1.3.bb b/packages/wview/wview-vpro_3.1.3.bb
index 1933e07..4c84152 100644 (file)
--- a/packages/wview/wview-vpro_3.1.3.bb
+++ b/packages/wview/wview-vpro_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-vpro"
-PR = "r0"
+PR = "r1"

diff --git a/packages/wview/wview-wxt510_3.1.3.bb b/packages/wview/wview-wxt510_3.1.3.bb
index b7b0ef2..84f175f 100644 (file)
--- a/packages/wview/wview-wxt510_3.1.3.bb
+++ b/packages/wview/wview-wxt510_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-wxt510"
-PR = "r0"
+PR = "r1"