From: olli <olli@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 15 Aug 2007 18:21:44 +0000 (+0000)
Subject: vsftpd: Cleanup Makefile
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=94b3d03d11f22a421f2f266a6e1b842b5b550296;p=packages.git

vsftpd: Cleanup Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8414 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 391d4873a..051281bc5 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -10,15 +10,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
 PKG_VERSION:=2.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
 PKG_MD5SUM:=146062e8b2f93af43ff6c2c770feea94
-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
 
@@ -33,24 +29,11 @@ define Package/vsftpd/conffiles
 /etc/vsftpd.conf
 endef
 
-define Build/Configure
-endef
-
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		vsftpd install
-endef
-
 define Package/vsftpd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vsftpd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/vsftpd.conf $(1)/etc/vsftpd.conf
+	$(INSTALL_CONF) ./files/vsftpd.conf $(1)/etc/vsftpd.conf
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/vsftpd.init $(1)/etc/init.d/vsftpd
 endef