fixed another bug.. now v060 Signed-off-by: Michael Vogt <michu at neophob.com>

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

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index b0af1e27a42fec14d51585a71da0250c4ae8149d..abd24e7614f4eaa8320c9eadd0dba8669592347e 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/syslog-ng
@@ -31,10 +28,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
@@ -50,13 +46,12 @@ $(call Build/Configure/Default,--disable-dependency-tracking \
 endef
 
 define Build/Compile   
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install)
+$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef
 
 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