cvs: php-src(PHP_5_3) /ext/phar Makefile.frag
| From: | Marcus Boerger | Date: | Mon, 02 Jun 2008 15:50:42 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50261@lists.php.net to get a copy of this message | ||
helly Mon Jun 2 15:50:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar Makefile.frag
Log:
- Remove checked-in or older version of phar.phar as we might not be able to open it
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/Makefile.frag?r1=1.14.2.1&r2=1.14.2.2&diff_format=u
Index: php-src/ext/phar/Makefile.frag
diff -u php-src/ext/phar/Makefile.frag:1.14.2.1 php-src/ext/phar/Makefile.frag:1.14.2.2
--- php-src/ext/phar/Makefile.frag:1.14.2.1 Sat May 31 20:02:57 2008
+++ php-src/ext/phar/Makefile.frag Mon Jun 2 15:50:42 2008
@@ -13,7 +13,8 @@
$$PHP $(srcdir)/build_precommand.php > $(builddir)/phar.php
$(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php
$(SAPI_CLI_PATH)
- if test -x "$(PHP_EXECUTABLE)"; then \
+ -@test -f $(builddir)/phar.phar && rm -f $(builddir)/phar.phar
+ -@if test -x "$(PHP_EXECUTABLE)"; then \
export PHP="$(PHP_EXECUTABLE)"; \
export BANG="$(PHP_EXECUTABLE)"; \
else \