opennhrp: Fix compile on 2.6.36

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

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index 196ef025fbcaa572d85d1c0b5114717e9f5a6274..0ceff3d1e6145e01bb6f996a37da8ec44f0696b4 100644 (file)
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -18,15 +17,11 @@ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
        ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
 PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
-PKG_CAT:=bzcat
-
-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
@@ -69,7 +64,9 @@ define Package/ulogd-mod-extra
   $(call Package/ulogd/Default)
   DEPENDS:=ulogd
   TITLE:=Extra plugins
-  DESCRIPTION:=\
+endef
+
+define Package/ulogd-mod-extra/description
        This package contains the LOCAL, LOGEMU, OPRINT, PWSNIFF and SYSLOG plugins.
 endef
 
@@ -106,25 +103,31 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
+               CFLAGS="$(TARGET_CFLAGS) \
+                       -Iinclude \
+                       -I$(PKG_BUILD_DIR)/include/ulogd \
+                       -I$(PKG_BUILD_DIR)/include \
+                       -I$(PKG_BUILD_DIR)/libipulog/include \
+                       $(TARGET_CPPFLAGS)" \
                all install
 endef
 
 define Package/ulogd/install   
-       install -d -m0755 $(1)/etc
+       $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
-       install -d -m0755 $(1)/usr/lib/ulogd
+       $(INSTALL_DIR) $(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 -d -m0755 $(1)/etc/default
-       install -m0644 ./files/ulogd.default $(1)/etc/default/ulogd
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/ulogd.init $(1)/etc/init.d/ulogd
+       $(INSTALL_DIR) $(1)/etc/default
+       $(INSTALL_DATA) ./files/ulogd.default $(1)/etc/default/ulogd
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/ulogd.init $(1)/etc/init.d/ulogd
 endef
 
 define BuildPlugin
   define Package/$(1)/install
-       install -m0755 -d $$(1)/usr/lib/ulogd
+       $(INSTALL_DIR) $$(1)/usr/lib/ulogd
        for m in $(2); do \
                $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$$$$$${m}.so $$(1)/usr/lib/ulogd/ ; \
        done