svn: /php/php-src/ branches/PHP_5_3/ext/phar/Makefile.frag trunk/ext/phar/Makefile.frag
| From: | Pierre Joye | Date: | Wed, 16 Jun 2010 18:30:35 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/phar/Makefile.frag trunk/ext/phar/Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62901@lists.php.net to get a copy of this message | ||
pajoye Wed, 16 Jun 2010 18:30:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300499
Log:
- Fix bug #50578, incorrect shebang in phar.phar
Bug: http://bugs.php.net/50578 (Assigned) incorrect shebang
in phar.phar
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
U php/php-src/trunk/ext/phar/Makefile.frag
Modified: php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2010-06-16 16:43:00 UTC (rev 300498)
+++ php/php-src/branches/PHP_5_3/ext/phar/Makefile.frag 2010-06-16 18:30:35 UTC (rev 300499)
@@ -19,11 +19,7 @@
else \
$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
fi;`
-PHP_PHARCMD_BANG = `if test -x "$(PHP_EXECUTABLE)"; then \
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
- else \
- $(top_srcdir)/build/shtool echo -n --
"$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)"; \
- fi; `
+PHP_PHARCMD_BANG =
$(top_srcdir)/build/shtool echo -n --
"$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
Modified: php/php-src/trunk/ext/phar/Makefile.frag
===================================================================
--- php/php-src/trunk/ext/phar/Makefile.frag 2010-06-16 16:43:00 UTC (rev 300498)
+++ php/php-src/trunk/ext/phar/Makefile.frag 2010-06-16 18:30:35 UTC (rev 300499)
@@ -19,11 +19,7 @@
else \
$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
fi;`
-PHP_PHARCMD_BANG = `if test -x "$(PHP_EXECUTABLE)"; then \
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
- else \
- $(top_srcdir)/build/shtool echo -n --
"$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)"; \
- fi; `
+PHP_PHARCMD_BANG = $(top_srcdir)/build/shtool echo -n --
"$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar