diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-30 15:18:59 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-02 00:40:22 +0100 |
| commit | e07c97adcb55629dc0cc72aed2bb652f7af640a5 (patch) | |
| tree | 8644f60c80f0d9ed5f9ef2b1dca21daf423d1719 /package/php/php.mk | |
| parent | e3d6179bb767c4a6d726cf897d47a076892357db (diff) | |
| download | buildroot-e07c97adcb55629dc0cc72aed2bb652f7af640a5.tar.gz buildroot-e07c97adcb55629dc0cc72aed2bb652f7af640a5.zip | |
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 <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/php.mk')
| -rw-r--r-- | package/php/php.mk | 6 |
1 files changed, 2 insertions, 4 deletions
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 |
