]> granicus.if.org Git - php/commitdiff
- Use -n only for current built PHP
authorMarcus Boerger <helly@php.net>
Wed, 4 Jun 2008 09:47:17 +0000 (09:47 +0000)
committerMarcus Boerger <helly@php.net>
Wed, 4 Jun 2008 09:47:17 +0000 (09:47 +0000)
ext/phar/Makefile.frag

index d8885c62cd933707b1f70af68362db304649b3ae..e5e134325f4a6892852dc05ec62c870e1d5f4987 100755 (executable)
@@ -4,10 +4,10 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
 
 pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
 
-PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
 PHP_PHARCMD_EXECUTABLE = ` \
        if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
-               $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH)"; \
+               $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
                if test "x$(PHP_MODULES)" != "x"; then \
                $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
                for i in bz2 zlib phar; do \