Fix syslog-ng build and cleanup Makefile.

[openwrt/svn-archive/archive.git] / admin / syslog-ng / Makefile

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 0d0f91d4750d3d95d66e3ac2711cc73eb7d547db..09e6bc274843f89225dbadb2dabfdaa433814ffe 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,13 +13,10 @@ PKG_VERSION:=1.6.12
 PKG_RELEASE:=1
 PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3
 
-PKG_SOURCE_URL:= http://www.balabit.com/downloads/syslog-ng/1.6/src \
-               http://www.balabit.com/downloads/syslog-ng/stable/src
+PKG_SOURCE_URL:= \
+       http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src \
+       http://www.balabit.com/downloads/files/syslog-ng/stable/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -32,10 +29,9 @@ define Package/syslog-ng
 endef
 
 define Package/syslog-ng/description
-syslog-ng reads and logs messages to the system console, log
+       syslog-ng reads and logs messages to the system console, log
        files, other machines and/or users as specified by its
        configuration file.
-
 endef
 
 define Package/syslog-ng/conffiles
@@ -43,21 +39,24 @@ define Package/syslog-ng/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--disable-dependency-tracking \
-                        --disable-full-static \
-                        --enable-tcp-wrapper \
-                        --with-libol="$(STAGING_DIR)/usr/bin",CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol")
+       $(call Build/Configure/Default, \
+               --disable-dependency-tracking \
+        --disable-full-static \
+        --enable-tcp-wrapper \
+        --with-libol="$(STAGING_DIR)/host/bin" \
+               , \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
+       )
 endef
 
-define Build/Compile   
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install)
+define Build/Compile
+       $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef
 
-define Package/syslog-ng/install       
+define Package/syslog-ng/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
        $(INSTALL_DIR) $(1)/etc/syslog-ng