diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2016-02-08 20:29:24 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2016-02-08 20:29:24 +0200 |
| commit | fb7d673ef2142f3d11a190b2ce64133728a950af (patch) | |
| tree | 94003292402371f6e8bd015825930227f138901b /sapi/fpm/Makefile.frag | |
| parent | 3ef57f8d5d1ca853aebbc873b6bf18dbdcc197da (diff) | |
| parent | 6772fbff621e7f39cea9ad7e90ec9380abe100a6 (diff) | |
| download | php-git-fb7d673ef2142f3d11a190b2ce64133728a950af.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align spacing in make install messages
Add entry for re-fix of #70976 in commit 14e4d393
Diffstat (limited to 'sapi/fpm/Makefile.frag')
| -rw-r--r-- | sapi/fpm/Makefile.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index e39fbcb1e8..b0b4b34658 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -19,6 +19,6 @@ install-fpm: $(SAPI_FPM_PATH) @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 - @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" + @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html |