natpmp package

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

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index b1c8e3709f1050ea4f25064b2b72716ea55a7549..1d65f6b0fe53ada549fe17ab99138397dd9038fd 100644 (file)
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -18,7 +18,6 @@ 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
@@ -69,7 +68,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,6 +107,12 @@ 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 \
+                       -I$(STAGING_DIR)/usr/include" \
                all install
 endef
 
@@ -113,7 +120,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