1 |
slords |
1.1 |
diff -urNp php-5.3.2/ext/phar/Makefile.frag php-5.3.2-new/ext/phar/Makefile.frag |
2 |
|
|
--- php-5.3.2/ext/phar/Makefile.frag 2010-06-09 09:57:28.000000000 +1000 |
3 |
|
|
+++ php-5.3.2-new/ext/phar/Makefile.frag 2010-06-09 09:58:43.000000000 +1000 |
4 |
|
|
@@ -19,11 +19,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ |
5 |
|
|
else \ |
6 |
|
|
$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
7 |
|
|
fi;` |
8 |
|
|
-PHP_PHARCMD_BANG = `if test -x "$(PHP_EXECUTABLE)"; then \ |
9 |
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
10 |
|
|
- else \ |
11 |
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)"; \ |
12 |
|
|
- fi; ` |
13 |
|
|
+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
14 |
|
|
|
15 |
|
|
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
16 |
|
|
-@test -d $(builddir)/phar || mkdir $(builddir)/phar |