From: Thomas Petazzoni Date: Sun, 30 Nov 2014 14:18:59 +0000 (+0100) Subject: php: install configuration file unconditionally X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e07c97adcb55629dc0cc72aed2bb652f7af640a5;p=buildroot.git php: 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. [Peter: use install -D] Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- diff --git a/package/php/php.mk b/package/php/php.mk index ae959db466..e6ea65fb66 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -238,10 +238,8 @@ PHP_POST_INSTALL_TARGET_HOOKS += PHP_EXTENSIONS_FIXUP define PHP_INSTALL_FIXUP rm -rf $(TARGET_DIR)/usr/lib/php rm -f $(TARGET_DIR)/usr/bin/phpize - if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \ - $(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \ - $(TARGET_DIR)/etc/php.ini; \ - fi + $(INSTALL) -D -m 0755 $(PHP_DIR)/php.ini-production \ + $(TARGET_DIR)/etc/php.ini endef PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP