Fix pciutils installation (#1921)

[openwrt/svn-archive/archive.git] / utils / pciutils / Makefile

diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile
index 7b12360c0baceab331196f6574544558b1195c10..ec404aa4a1f781b7001a95d5c173f0308966fcb4 100644 (file)
--- a/utils/pciutils/Makefile
+++ b/utils/pciutils/Makefile
@@ -12,14 +12,13 @@ PKG_NAME:=pciutils
 PKG_VERSION:=2.2.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.kernel.org/pub/software/utils/pciutils/ \
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PKG_MD5SUM:=c18e2a5f04e9abae5a42439de294f086
 PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,24 +26,48 @@ define Package/pciutils
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Linux PCI Utilities
-  DESCRIPTION:=Linux PCI Utilities.\\\
-    This package contains various utilities for inspecting and setting of \\\
-    devices connected to the PCI bus.
+  DESCRIPTION:=\
+       This package contains various utilities for inspecting and setting of \\\
+       devices connected to the PCI bus.
   URL:=http://www.kernel.org/pub/software/utils/pciutils/
 endef
 
+define Package/pciutils/postinst
+#!/bin/sh
+$${IPKG_INSTROOT}/usr/sbin/update-pciids.sh
+endef
+
 define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" IDSDIR="/usr/share" HOST=$(GNU_TARGET_NAME)
+       $(call Build/Compile/Default, \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               IDSDIR="/usr/share" \
+               HOST="$(GNU_TARGET_NAME)" \
+       )
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/lib/libpci.a $(STAGING_DIR)/usr/lib
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/include/pci
+       $(CP) $(PKG_BUILD_DIR)/lib/pci.h $(STAGING_DIR)/usr/include/pci
+       $(CP) $(PKG_BUILD_DIR)/lib/config.h $(STAGING_DIR)/usr/include/pci
+       $(CP) $(PKG_BUILD_DIR)/lib/header.h $(STAGING_DIR)/usr/include/pci
+       $(CP) $(PKG_BUILD_DIR)/lib/types.h $(STAGING_DIR)/usr/include/pci
+endef
+
+define Build/UninstallDev
+       rm -rf \
+               $(STAGING_DIR)/usr/include/pci \
+               $(STAGING_DIR)/usr/lib/libpci.a
 endef
 
 define Package/pciutils/install
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/{lspci,setpci} $(1)/usr/sbin/
-       install -d -m0755 $(1)/usr/share
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/{lspci,setpci,update-pciids.sh} $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/share
        $(CP) $(PKG_BUILD_DIR)/pci.ids $(1)/usr/share/
 endef