helly Wed Jun 4 16:38:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar Makefile.frag
Log:
- Make phar.phar building work for virtualized builds
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/Makefile.frag?r1=1.14.2.4&r2=1.14.2.5&diff_format=u
Index: php-src/ext/phar/Makefile.frag
diff -u php-src/ext/phar/Makefile.frag:1.14.2.4
php-src/ext/phar/Makefile.frag:1.14.2.5
--- php-src/ext/phar/Makefile.frag:1.14.2.4 Wed Jun 4 09:47:17 2008
+++ php-src/ext/phar/Makefile.frag Wed Jun 4 16:38:13 2008
@@ -25,15 +25,19 @@
$(top_srcdir)/build/shtool echo -n --
"$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)"; \
fi; `
+$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
+ [EMAIL PROTECTED] -d $(builddir)/phar || mkdir $(builddir)/phar
+ [EMAIL PROTECTED] -f $(builddir)/phar/phar.inc || cp
$(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
+
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc
$(srcdir)/phar/*.php $(SAPI_CLI_PATH)
[EMAIL PROTECTED] "Generating phar.php"
@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS)
$(srcdir)/build_precommand.php > $(builddir)/phar.php
-$(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc
$(srcdir)/phar/*.php $(SAPI_CLI_PATH)
+$(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc
$(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
[EMAIL PROTECTED] "Generating phar.phar"
- [EMAIL PROTECTED] -f $(top_builddir)/ext/phar/phar.phar
- [EMAIL PROTECTED] -f $(top_srcdir)/ext/phar/phar.phar
- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/phar.php
pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s
$(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/
+ [EMAIL PROTECTED] -f $(builddir)/phar.phar
+ [EMAIL PROTECTED] -f $(srcdir)/phar.phar
+ @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php
pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s
$(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/
[EMAIL PROTECTED] +x $(builddir)/phar.phar
install-pharcmd: pharcmd
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
