com php-src: Fix #61345: fix install of CGI binary: sapi/cgi/Makefile.frag
| From: | Stanislav Malyshev | Date: | Sun, 11 Aug 2013 00:33:24 +0000 |
| Subject: | com php-src: Fix #61345: fix install of CGI binary: sapi/cgi/Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72901@lists.php.net to get a copy of this message | ||
Commit: cdedee3fa11be4d71364ad4843aa095df03c7159
Author: Michael Heimpold <mhei@heimpold.de> Fri, 9 Aug 2013 21:06:17 +0200
Committer: Stanislav Malyshev <stas@php.net> Sat, 10 Aug 2013 17:33:24 -0700
Parents: 503d39d9252b4134f2387ac7914f60083aa1c990
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cdedee3fa11be4d71364ad4843aa095df03c7159
Log:
Fix #61345: fix install of CGI binary
When CLI was not built but only CGI binary, then a sequence of
$ ./buildconf
$ ./configure --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install
results in the following error:
/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp
ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary: /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1
The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.
Signed-off-by: Oliver Metz <oliver.metz@gmx.de>
[extensive commit message]
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Bugs:
https://bugs.php.net/61345
Changed paths:
M sapi/cgi/Makefile.frag
Diff:
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index d54dd40..d3d7cb3 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