From 0e18b0a4e12e739aed6eb892a246d3d27a007a38 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 30 Nov 2014 15:18:51 +0100 Subject: [PATCH] proftpd: install configuration file unconditionally As discussed, users should use a rootfs overlay or a post-build script instead of a custom skeleton to override files installed by Buildroot, so there is no point in having conditions when installing init scripts or configuration files. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/proftpd/proftpd.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index ce66a3f6c1..0fd8cc8662 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -48,10 +48,8 @@ PROFTPD_MAKE = $(MAKE1) define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd - @if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \ - $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ - $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ - fi + $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ + $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ endef define PROFTPD_INSTALL_INIT_SYSV -- 2.30.2