summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-10 17:33:28 -0700
committerStanislav Malyshev <stas@php.net>2013-08-10 17:33:28 -0700
commit3f99ba6351d5742dbbec8ad96eae4ee973965fde (patch)
tree5c74e362f338a844c0b097c6589422c83edd9896
parent143ec706388d3d3dcbfe73e4d14f57c97daa134d (diff)
parentcdedee3fa11be4d71364ad4843aa095df03c7159 (diff)
downloadphp-git-3f99ba6351d5742dbbec8ad96eae4ee973965fde.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix #61345: fix install of CGI binary
-rw-r--r--sapi/cgi/Makefile.frag1
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index d54dd40808..d3d7cb3553 100644
--- a/sapi/cgi/Makefile.frag
+++ b/sapi/cgi/Makefile.frag
@@ -5,6 +5,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
install-cgi: $(SAPI_CGI_PATH)
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
@echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1