rrs: fix dependencies

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

diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index 354b2385677c8b6f60472fa7dfccc148684a48ac..c90dc0ce8f59d86a73df6e860fb6bc33f96478a2 100644 (file)
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -10,35 +10,40 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrs
 PKG_VERSION:=1.70
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cycom.se/uploads/36/19 
 PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rrs/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx 
+  MENU:=1
+  DEPENDS:=+uclibcxx
   TITLE:=A reverse (connecting) remote shell
   URL:=http://www.cycom.se/dl/rrs/
 endef
 
 define Package/rrs
   $(call Package/rrs/Default)
-  DEPENDS+= +libopenssl
+  DEPENDS+=+libopenssl
   TITLE+= (with SSL support)
 endef
 
 define Package/rrs-nossl
+  $(call Package/rrs/Default)
+  DEPENDS+=rrs
   TITLE+= (without SSL support)
 endef
 
+ifneq ($(SDK),)
+  CONFIG_PACKAGE_rrs:=m
+  CONFIG_PACKAGE_rrs-nossl:=m
+endif
+
 define Build/Compile/Template
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
@@ -66,13 +71,13 @@ define Build/Compile
 endef
 
 define Package/rrs/install     
-       install -d -m0755 $(1)/usr/bin
-       install -m0755 $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs
 endef
 
 define Package/rrs-nossl/install       
-       install -d -m0755 $(1)/usr/bin
-       install -m0755 $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs
 endef
 
 $(eval $(call BuildPackage,rrs))