Cleanup libnetfilter-queue Makefile.

SVN-Revision: 12581

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index e20880ea2f7a01aa1839557bbbc4559a97f406bf..9321fc1fdb87189e12518919c6c1d0d2fba64352 100644 (file)
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -26,8 +26,8 @@ define Package/libnetfilter-queue
 endef
 
 define Package/libnetfilter-queue/description
-       libnetfilter_queue is a userspace library providing an API to packets 
-       that have been queued by the kernel packet filter. It is is part of a system 
+       libnetfilter_queue is a userspace library providing an API to packets
+       that have been queued by the kernel packet filter. It is is part of a system
        that deprecates the old ip_queue / libipq mechanism.
 endef
 
@@ -38,7 +38,7 @@ CONFIGURE_ARGS += \
        --enable-shared \
        LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
        LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
-       
+
 MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS)"
 
@@ -53,20 +53,25 @@ endef
 
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include/libnetfilter_queue
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h $(1)/usr/include/libnetfilter_queue/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue* $(1)/usr/lib/
-endef
+       $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h \
+               $(1)/usr/include/libnetfilter_queue/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so.*,la} \
+               $(1)/usr/lib/
 
-define Build/UninstallDev
-       rm -rf  $(1)/usr/include/libnetfilter_queue \
-               $(1)/usr/lib/libnetfilter_queue.{a,so*}
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libnetfilter-queue/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue* $(1)/usr/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so.*,a} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libnetfilter-queue))