- Remove etc/proftpd creation from Makefile

- Fix directory creation bug in patch-contrib-mod_sftp-Makefile.in
This commit is contained in:
Martin Matuska 2010-03-24 16:45:10 +00:00
parent fa77d99e16
commit 0ffb313445
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=251449
2 changed files with 4 additions and 4 deletions

View file

@ -401,7 +401,6 @@ post-configure:
post-install:
@cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf
.if defined(WITH_SFTP)
@${INSTALL} -d ${PREFIX}/etc/proftpd
@cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem
@cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat
.endif

View file

@ -1,11 +1,12 @@
--- contrib/mod_sftp/Makefile.in.orig 2010-03-24 11:07:25.556408812 +0100
+++ contrib/mod_sftp/Makefile.in 2010-03-24 11:07:49.115285644 +0100
@@ -45,8 +45,8 @@
--- contrib/mod_sftp/Makefile.in.orig 2009-09-16 08:09:57.000000000 +0200
+++ contrib/mod_sftp/Makefile.in 2010-03-24 17:38:46.947039120 +0100
@@ -45,8 +45,9 @@
fi
install-misc:
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/proftpd
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample