[packages] srelay: force libwrap use (closes: #6739), bump release number

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

diff --git a/net/srelay/Makefile b/net/srelay/Makefile
index 75583ce35fbd90e10a41a4a74395dd2c13faa118..5f41e7d00c15cb1488ce8578e926ae8b3935822b 100644 (file)
--- a/net/srelay/Makefile
+++ b/net/srelay/Makefile
@@ -1,23 +1,20 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=srelay
 PKG_VERSION:=0.4.6
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/socks-relay
 PKG_MD5SUM:=4a9f3298b38d8588f0ffde31b946a47f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/srelay
@@ -32,23 +29,20 @@ define Package/srelay/conffiles
 /etc/srelay.conf
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --disable-thread \
-       )
-endef
+CONFIGURE_ARGS += \
+       --disable-thread \
+       --with-libwrap="$(STAGING_DIR)/usr" \
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-endef
+CONFIGURE_VARS += \
+       CPPFLAGS="-DLINUX $$$$CPPFLAGS" \
 
 define Package/srelay/install  
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_DATA) files/srelay.conf $(1)/etc/
+       $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) files/srelay.init $(1)/etc/init.d/srelay
+       $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,srelay))