From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sat, 20 Sep 2008 09:24:34 +0000 (+0000)
Subject: pciutils: fix 2.2.4 -dev install and staging. bug# 4565
X-Git-Tag: Release-2010-05/1~6035
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4decd391fa4f70c1bd5d40095f4361445f43e33d;p=openembedded.git

pciutils: fix 2.2.4 -dev install and staging. bug# 4565
---

diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb
index 1f863b6057..2a909af26f 100644
--- a/packages/pciutils/pciutils_2.2.4.bb
+++ b/packages/pciutils/pciutils_2.2.4.bb
@@ -8,12 +8,12 @@ DEPENDS = "zlib"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
-           file://configure-uclibc.patch;patch=1 \
+	   file://configure-uclibc.patch;patch=1 \
 	   file://pcimodules-pciutils.diff;patch=1"
 
 PARALLEL_MAKE = ""
 
-PR="r2"
+PR="r3"
 
 do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
@@ -29,10 +29,32 @@ LDFLAGS += "-lz"
 do_install () {
 	oe_runmake install
 }
+
 do_install_append () {
 	install -d ${D}/${prefix}/share
 	install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share
+
+	# The makefile does not install the development files:
+	# libpci.a pci.h header.h config.h types.s
+	install -d ${D}/${libdir}
+	install -d ${D}/${includedir}/pci
+
+	oe_libinstall -a -C lib libpci ${D}/${libdir}
+	install -m 0644 ${S}/lib/pci.h ${D}/${includedir}/pci/
+	install -m 0644 ${S}/lib/header.h ${D}/${includedir}/pci/
+	install -m 0644 ${S}/lib/config.h ${D}/${includedir}/pci/
+	install -m 0644 ${S}/lib/types.h ${D}/${includedir}/pci/
 }
 
+do_stage () {
+	oe_libinstall -a -C lib libpci ${STAGING_LIBDIR}
+	install -m 0755 -d ${STAGING_INCDIR}/pci
+	install -m 0644 ${S}/lib/pci.h ${STAGING_INCDIR}/pci/
+	install -m 0644 ${S}/lib/header.h ${STAGING_INCDIR}/pci/
+	install -m 0644 ${S}/lib/config.h ${STAGING_INCDIR}/pci/
+	install -m 0644 ${S}/lib/types.h ${STAGING_INCDIR}/pci/
+}
+
+
 PACKAGES =+ "pciutils-ids"
 FILES_pciutils-ids="${prefix}/share/pci.ids"