Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 15:52:52-05:00 handhelds.org!kergoth
Fix the prismstumbler build now that wireless-tools stages its headers.

BKrev: 41f02538jfhASjK8PK0lMMINYWrg0g

diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb
index e69de29..b04b4a4 100644 (file)
--- a/packages/prismstumbler/prismstumbler_0.7.2.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.2.bb
@@ -0,0 +1,58 @@
+SECTION = "x11/network"
+PR = "r1"
+
+PACKAGES = "prismstumbler prismstumbler-frontend"
+DESCRIPTION = "Prismstumbler wireless LAN scanner"
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+DEPENDS = "libpcap gtk+ wireless-tools sqlite"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+CFLAGS =+ "-I${S}/include"
+
+FILES_${PN} = "${bindir}/prismstumbler"
+
+FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
+                              ${datadir}/applications \
+                              ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \
+                               ${sysconfdir}"
+
+do_configure() {
+  cd ${S};
+  oe_runconf;
+  cd ${S}/src/gpsd;
+  rm Makefile;
+  rm config.log;
+  rm config.cache;
+  ${S}/src/gpsd/configure \
+                    --build=${BUILD_SYS} \
+                    --host=${HOST_SYS} \
+                    --target=${TARGET_SYS} \
+                    --prefix=${prefix} \
+                    --exec_prefix=${exec_prefix} \
+                    --bindir=${bindir} \
+                    --sbindir=${sbindir} \
+                    --libexecdir=${libexecdir} \
+                    --datadir=${datadir} \
+                    --sysconfdir=${sysconfdir} \
+                    --sharedstatedir=${sharedstatedir} \
+                    --localstatedir=${localstatedir} \
+                    --libdir=${libdir} \
+                    --includedir=${includedir} \
+                    --oldincludedir=${oldincludedir} \
+                    --infodir=${infodir} \
+                    --mandir=${mandir} \
+                        ${EXTRA_OECONF} \
+                    $@;
+}
+
+do_install_append() {
+  chmod a+s ${D}/${bindir}/prismstumbler
+}

diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 9e287a8..8723c06 100644 (file)
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-libpcap=${STAGING_DIR}/${HOST_SYS} --with-sqlite-libs=${STAGING_LIBDIR} --with-sqlite-includes=${STAGING_INCDIR}"
+CFLAGS =+ "-I${S}/include"
 
 FILES_${PN} = "${bindir}/prismstumbler"