diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-07-01 17:06:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-01 17:06:01 +0000 |
| commit | 0bc469ac999a2b4e50fe92cdb71bdc54695f6440 (patch) | |
| tree | 09d28ce01a44de2d021792bc67da3dcee69dac54 | |
| parent | 808a7ab4aa66b8a1d58e6e5bb4c7c98231b31857 (diff) | |
wview: removed /usr/include from list of include dirs
| -rw-r--r-- | packages/wview/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/wview/files/Makefile.am.patch | 24 | ||||
| -rw-r--r-- | packages/wview/wview-common.inc | 5 | ||||
| -rw-r--r-- | packages/wview/wview-sim_3.1.3.bb | 2 | ||||
| -rw-r--r-- | packages/wview/wview-vpro_3.1.3.bb | 2 | ||||
| -rw-r--r-- | packages/wview/wview-wxt510_3.1.3.bb | 2 |
6 files changed, 30 insertions, 5 deletions
diff --git a/packages/wview/files/.mtn2git_empty b/packages/wview/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wview/files/.mtn2git_empty diff --git a/packages/wview/files/Makefile.am.patch b/packages/wview/files/Makefile.am.patch new file mode 100644 index 0000000000..1c35ee8c29 --- /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 0efeee271c..0df0707718 100644 --- 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 919e322f42..3f07aecc82 100644 --- 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 1933e077b5..4c84152f3b 100644 --- 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 b7b0ef236d..84f175f1d8 100644 --- 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" |