Skip to content

Commit 402fa43

Browse files
dreamcat4dreamcat four
authored andcommitted
Don't overwrite php-fpm.conf.old on 2nd, 3rd make install
1 parent 2940e5f commit 402fa43

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ install-fpm: all
744744

745745
@test "$(php_fpm_conf)" && \
746746
test -f "$(INSTALL_ROOT)$(php_fpm_conf_path)" && \
747-
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
747+
$(INSTALL_DATA) --backup=numbered $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
748748

749749
@test "$(php_fpm_conf)" && \
750750
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \

ac/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install-fpm: all
1818

1919
@test "$(php_fpm_conf)" && \
2020
test -f "$(INSTALL_ROOT)$(php_fpm_conf_path)" && \
21-
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
21+
$(INSTALL_DATA) --backup=numbered $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
2222

2323
@test "$(php_fpm_conf)" && \
2424
$(INSTALL_DATA) sapi/fpm/php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \

m4/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install-fpm: all
1818

1919
@test "$(php_fpm_conf)" && \
2020
test -f "$(INSTALL_ROOT)$(php_fpm_conf_path)" && \
21-
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
21+
$(INSTALL_DATA) --backup=numbered $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
2222

2323
@test "$(php_fpm_conf)" && \
2424
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \

0 commit comments

Comments
 (0)