[Packages] net/openssh:

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

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 56af288826b4a7eb34e8616b85e22c5c54eb0c04..606638a88202ffb63be02d3c9139b52cd6870ecf 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/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.
@@ -19,7 +19,6 @@ PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
                ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
                ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
 PKG_MD5SUM:=50a800fd2c6def9e9a53068837e87b91
-PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
@@ -33,6 +32,7 @@ define Package/openssh-client
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH client
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-client/description
@@ -49,6 +49,7 @@ define Package/openssh-client-utils
   DEPENDS:=openssh-client
   TITLE:=OpenSSH client utilities
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-client-utils/description
@@ -61,6 +62,7 @@ define Package/openssh-server
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH server
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-server/description
@@ -77,6 +79,7 @@ define Package/openssh-sftp-client
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH SFTP client
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-sftp-client/description
@@ -89,6 +92,7 @@ define Package/openssh-sftp-server
   DEPENDS:=
   TITLE:=OpenSSH SFTP server
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-sftp-server/description
@@ -156,15 +160,13 @@ define Package/openssh-client/install
        chmod 0700 $(1)/etc/ssh
        $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/
 endef
 
 define Package/openssh-client-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/
+       $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/
 endef
 
 define Package/openssh-server/install
@@ -174,9 +176,9 @@ define Package/openssh-server/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
 endef
 
 define Package/openssh-server/postinst
@@ -221,7 +223,7 @@ endef
 
 define Package/openssh-sftp-client/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
 endef
 
 define Package/openssh-sftp-server/install