X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fautossh%2FMakefile;h=97bc1241429772afce0bf43bd197532a1e0c5d5c;hb=3e6eb825b6c668c267fe1f7ef9220569948a4093;hp=e3905bf9875ea546af3f6f59cfea4ca1d55ac8ae;hpb=ec0ee9474c31753d97210ed94beb53ca3821dcdf;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/autossh/Makefile b/net/autossh/Makefile
index e3905bf987..97bc124142 100644
--- a/net/autossh/Makefile
+++ b/net/autossh/Makefile
@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,43 +9,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autossh
-PKG_VERSION:=1.3
+PKG_VERSION:=1.4a
 PKG_RELEASE:=1
-PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f
 
-PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/
+PKG_MD5SUM:=a5497938986f0c179926f1ebba603767
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/autossh
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+openssh-client
   TITLE:=Autossh client
-  DESCRIPTION:=Autossh client
-  URL:=http://www.harding.motd.ca/autossh
-endef
-
-define Build/Configure
-$(CP) $(PKG_BUILD_DIR)/Makefile.linux $(PKG_BUILD_DIR)/Makefile
+  URL:=http://www.harding.motd.ca/autossh/
+  SUBMENU:=ssh
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"$(SSH)\\\"\" -D\"VER=\\\"$(PKG_VERSION)\\\"\"" \
-		BINDIR=/usr/bin MANDIR=/usr/man
+	$(call Build/Compile/Default, -f Makefile \
+		CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"\$$$$(SSH)\\\"\" -D\"VER=\\\"\$$$$(VER)\\\"\"" \
+		all \
+	)
 endef
 
 define Package/autossh/install
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/autossh.init $(1)/etc/init.d/autossh
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/autossh.config $(1)/etc/config/autossh
 endef
 
 $(eval $(call BuildPackage,autossh))