From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 May 2009 11:29:28 +0000 (+0200)
Subject: Fixed installation of some files in vsftpd.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1aa362ac35695c3ace6cab27e1392bf7963ff50;p=ipfire-3.x.git

Fixed installation of some files in vsftpd.
---

diff --git a/config/pam.d/vsftpd.pam b/config/pam.d/vsftpd
similarity index 100%
rename from config/pam.d/vsftpd.pam
rename to config/pam.d/vsftpd
diff --git a/lfs/vsftpd b/lfs/vsftpd
index 062f12cd7..5b67452cf 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -102,9 +102,11 @@ $(OBJECT): $(objects)
 	cd $(DIR_APP) && install -v -m 755 vsftpd /usr/sbin/vsftpd
 	cd $(DIR_APP) && install -v -m 644 vsftpd.8 /usr/share/man/man8
 	cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
-	cd $(DIR_APP) && install -v -m 644 $(DIR_CONFIG)/$(PKG_NAME)/vsftpd.conf /etc
-	cd $(DIR_APP) && install -v -m 644 $(DIR_CONFIG)/$(PKG_NAME)/vsftpd.user_list /etc
-	cd $(DIR_APP) && install -v -m 644 $(DIR_CONFIG)/pam.d/vsftpd.pam /etc/pam.d
+
+	# Install config
+	-mkdir -pv /etc/$(PKG_NAME)
+	cp -vf $(DIR_CONFIG)/$(PKG_NAME)/$(PKG_NAME).{conf,user_list} /etc/$(PKG_NAME)
+	cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)