From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 3 Sep 2009 01:51:59 +0000 (+0000)
Subject: clean up the syslog-ng3 package and make it compile
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=3317540102f8e5e55ea824a81673f9105ca289e0;p=packages.git

clean up the syslog-ng3 package and make it compile

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17501 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile
index dcb92d808..25fec836d 100644
--- a/admin/syslog-ng3/Makefile
+++ b/admin/syslog-ng3/Makefile
@@ -37,17 +37,25 @@ define Package/syslog-ng3/conffiles
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-dependency-tracking \
-		--enable-tcp-wrapper \
-		--disable-glibtest \
-		, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include/eventlog $(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-		PKG_CONFIG="$(STAGING_DIR_HOST)/bin/pkg-config" \
-	)
+	$(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure
+	$(Build/Configure/Default)
 endef
 
+CONFIGURE_ARGS +=  \
+	--disable-dependency-tracking \
+	--enable-tcp-wrapper \
+	--disable-glibtest
+
+TARGET_CPPFLAGS += \
+	-I$(STAGING_DIR)/usr/include/eventlog
+
+TARGET_LDFLAGS += \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+
+CONFIGURE_VARS += \
+	LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"
+
 define Package/syslog-ng3/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/