From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 20 Aug 2006 23:29:29 +0000 (+0000)
Subject: fix autossh, standardize
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3ab011f06072026dc96d2cdb5df58d7416ad6c5c

fix autossh, standardize


SVN-Revision: 4616
---

diff --git a/net/autossh/Makefile b/net/autossh/Makefile
index 12fb9a481c..0ed8919585 100644
--- a/net/autossh/Makefile
+++ b/net/autossh/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=autossh
 PKG_VERSION:=1.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f
 
-PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh
+PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -30,20 +30,16 @@ define Package/autossh
   URL:=http://www.harding.motd.ca/autossh
 endef
 
-define Build/Configure
-$(CP) $(PKG_BUILD_DIR)/Makefile.linux $(PKG_BUILD_DIR)/Makefile
-endef
-
 define Build/Compile
-$(call Build/Compile/Default, \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"$(SSH)\\\"\" -D\"VER=\\\"$(PKG_VERSION)\\\"\"" \
-	BINDIR=/usr/bin MANDIR=/usr/man \
-)
+	$(call Build/Compile/Default, -f Makefile.linux \
+		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 -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,autossh))