Переглянути джерело

libnetfilter-queue: fix license, cleanup

Signed-off-by: Nicolas Thill <nico@openwrt.org>
Nicolas Thill 10 роки тому
джерело
коміт
d5029d9f5c
1 змінених файлів з 8 додано та 13 видалено
  1. 8
    13
      libs/libnetfilter-queue/Makefile

+ 8
- 13
libs/libnetfilter-queue/Makefile Переглянути файл

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2007-2014 OpenWrt.org
2
+# Copyright (C) 2007-2015 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:= \
18 18
 	http://mirrors.evolva.ro/netfilter.org/libnetfilter_queue/
19 19
 PKG_MD5SUM:=df09befac35cb215865b39a36c96a3fa
20 20
 
21
-PKG_LICENSE:=GPL-2.0
21
+PKG_LICENSE:=GPL-2.0+
22 22
 PKG_LICENSE_FILES:=COPYING
23 23
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
24 24
 
@@ -30,9 +30,9 @@ include $(INCLUDE_DIR)/package.mk
30 30
 define Package/libnetfilter-queue
31 31
   SECTION:=libs
32 32
   CATEGORY:=Libraries
33
-  DEPENDS:=+libmnl +libnfnetlink +kmod-nfnetlink-queue
34 33
   TITLE:=API to packets queued by the kernel packet filter
35 34
   URL:=http://www.netfilter.org/projects/libnetfilter_queue/
35
+  DEPENDS:=+libmnl +libnfnetlink +kmod-nfnetlink-queue
36 36
 endef
37 37
 
38 38
 define Package/libnetfilter-queue/description
@@ -46,23 +46,18 @@ CONFIGURE_ARGS += \
46 46
 	--enable-static \
47 47
 	--enable-shared \
48 48
 
49
-CONFIGURE_VARS += \
50
-	LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
51
-	LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
52 49
 
53 50
 define Build/InstallDev
54
-	$(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue
55
-	$(INSTALL_DATA) \
56
-		$(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h \
57
-		$(1)/usr/include/libnetfilter_queue/
58
-
51
+	$(INSTALL_DIR) $(1)/usr/include
52
+	$(CP) \
53
+		$(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue \
54
+		$(1)/usr/include/
59 55
 	$(INSTALL_DIR) $(1)/usr/lib
60 56
 	$(CP) \
61 57
 		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \
62 58
 		$(1)/usr/lib/
63
-
64 59
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
65
-	$(INSTALL_DATA) \
60
+	$(CP) \
66 61
 		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \
67 62
 		$(1)/usr/lib/pkgconfig/
68 63
 endef