[packages] transmission: make scrape-paused-torrents optional

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

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index aed17d97f2a2e95b635db89b847f4a0cbf22fb0f..ddfdc1c52c5d2e4a30393d692bca71e9ac81c87c 100644 (file)
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -19,13 +18,10 @@ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
 PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 define Package/ulogd/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://gnumonks.org/projects/ulogd
+  URL:=http://www.netfilter.org/projects/ulogd/index.html
 endef
 
 define Package/ulogd
@@ -102,6 +98,7 @@ define Build/Configure
                , \
                ac_cv_header_pcap_h=$(ULOGD_PCAP_HEADER) \
        )
+       $(SED) 's/-lgcc_s//g' $(PKG_BUILD_DIR)/Rules.make
 endef
 
 define Build/Compile
@@ -112,7 +109,8 @@ define Build/Compile
                        -I$(PKG_BUILD_DIR)/include/ulogd \
                        -I$(PKG_BUILD_DIR)/include \
                        -I$(PKG_BUILD_DIR)/libipulog/include \
-                       -I$(STAGING_DIR)/usr/include" \
+                       -Wl,--export-dynamic \
+                       $(TARGET_CPPFLAGS)" \
                all install
 endef
 
@@ -120,7 +118,7 @@ define Package/ulogd/install
        $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/lib/ulogd
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/
        $(INSTALL_DIR) $(1)/etc/default