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 062f12cd714c20a43762744c81d96ed7b4482e4e..5b67452cfc8f6fad6acd670ef85fabf120f89099 100644 (file)
--- 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)