fix build on 2.6.19 (closes: #1070), fix missing process name in syslog (closes:...

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

diff --git a/net/srelay/Makefile b/net/srelay/Makefile
index 595f37817d953faeac9204c8f7d094b9caf6faac..689483dd7d11c06e57b83f7d5d19b953ed43eae9 100644 (file)
--- a/net/srelay/Makefile
+++ b/net/srelay/Makefile
@@ -11,15 +11,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=srelay
 PKG_VERSION:=0.4.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f
 
-PKG_SOURCE_URL:=@SF/socks-relay
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/socks-relay
+PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_INIT_LEVEL:=60
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,7 +25,6 @@ define Package/srelay
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A socks 4/5 proxy server
-  DESCRIPTION:=A socks 4/5 protocol proxy server
   URL:=http://www.c-wind.com/srelay/
 endef
 
@@ -36,16 +33,22 @@ define Package/srelay/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--disable-thread)
+       $(call Build/Configure/Default, \
+               --disable-thread \
+       )
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 define Package/srelay/install  
-       install -m0755 -d $(1)/usr/bin
-       install -m0755 -d $(1)/etc/init.d
-       $(CP) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
-       $(CP) files/srelay.init $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
-       $(CP) files/srelay.conf $(1)/etc
-       chmod 755 $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) files/srelay.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) files/srelay.init $(1)/etc/init.d/srelay
 endef
 
 $(eval $(call BuildPackage,srelay))