1--- php-5.4.22/ext/phar/Makefile.frag.orig 2013-11-22 17:22:04.000000000 -0800 2+++ php-5.4.22/ext/phar/Makefile.frag 2013-11-22 17:24:58.000000000 -0800 3@@ -18,7 +18,7 @@ 4 else \ 5 $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ 6 fi;` 7-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 8+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 9 10 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc 11 -@test -d $(builddir)/phar || mkdir $(builddir)/phar 12@@ -26,20 +26,20 @@ 13 14 $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) 15 -@echo "Generating phar.php" 16- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php 17+ $(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php 18 19 $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) 20 -@echo "Generating phar.phar" 21 -@rm -f $(builddir)/phar.phar 22 -@rm -f $(srcdir)/phar.phar 23- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ 24- -@chmod +x $(builddir)/phar.phar 25+ $(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/ 26+ -chmod +x $(builddir)/phar.phar 27 28 install-pharcmd: pharcmd 29 -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) 30 $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) 31 -@rm -f $(INSTALL_ROOT)$(bindir)/phar 32- $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar 33+ cd $(INSTALL_ROOT)$(bindir) && $(LN_S) -f phar.phar phar 34 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 35 @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 36 @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 37