Fix peeguardian compilation against libipq other programs should also use those libra...

[openwrt/svn-archive/archive.git] / net / peerguardian / Makefile

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index d871052c703b77167170ba672791881537eedb60..36ec034aaa63642a2e23872bd2a5b5c139f9e621 100644 (file)
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -15,40 +15,34 @@ PKG_RELEASE:=1
 PKG_SOURCE:=pglinux-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/peerguardian
 PKG_MD5SUM:=0fb2bc5501b031604fc56eec3bd35fa4
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/pglinux-$(PKG_VERSION)
 
-PKG_BUILDDEP:=iptables
+PKG_BUILD_DEPENDS:=iptables
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libpthread +libncurses
+  DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx +libnetfilter-queue +libnfnetlink
   TITLE:=PeerGuardian for Linux
-  DESCRIPTION:=\
-       PeerGuardian helps protect your privacy by blocking many ranges \\\
-       of aggressive IPs while you use P2P.
   URL:=http://phoenixlabs.org/
 endef
 
+define Package/peerguardian/description
+ PeerGuardian helps protect your privacy by blocking many ranges  of aggressive 
+ IPs while you use P2P.
+endef
+
 define Package/peerguardian/conffiles
 /etc/PG.conf
 /etc/p2p.p2b.p2p
 endef
 
-# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
-PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lm,-lc
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               , \
-               CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
-               LIBS="$(PKG_CONFIGURE_LIBS)" \
-       )
-endef
+CONFIGURE_VARS+= \
+       CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \
+       LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -63,7 +57,7 @@ define Package/peerguardian/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/peerguardian.init $(1)/etc/init.d/peerguardian
+       $(INSTALL_BIN) ./files/peerguardian.init $(1)/etc/init.d/peerguardian
 endef
 
 $(eval $(call BuildPackage,peerguardian))