diff options
| author | Greg Beaver <cellog@php.net> | 2007-11-22 18:43:29 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2007-11-22 18:43:29 +0000 |
| commit | 995d240c488c9cd4f0c433da1a28d65749cb8a0a (patch) | |
| tree | 6152e11b60554c1ec132c282c7c09a2a81835d0c | |
| parent | e6612be48bc3a2d10ef816c576b9b6f960b5bb50 (diff) | |
| download | php-git-995d240c488c9cd4f0c433da1a28d65749cb8a0a.tar.gz | |
revert Bug #11950 'fix', it breaks everything
| -rwxr-xr-x | ext/phar/Makefile.frag | 8 | ||||
| -rw-r--r-- | ext/phar/package.php | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index c644cd1383..e34b7535d5 100755 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -2,14 +2,12 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re $(RE2C) -b -o $(srcdir)/phar_path_check.c $(srcdir)/phar_path_check.re) -pharcmd: $(builddir)/phar.php $(builddir)/phar.phar +pharcmd: $(all_targets) $(builddir)/phar.php $(builddir)/phar.phar $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) -n -q -d extension_dir=$(builddir)/modules -d -extension=phar.so $(srcdir)/build_precommand.php > $(builddir)/phar.php + $(PHP_EXECUTABLE) $(srcdir)/build_precommand.php > $(builddir)/phar.php $(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) -n -q -d extension_dir=$(builddir)/modules -d -extension=phar.so -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ + $(PHP_EXECUTABLE) -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ @chmod +x $(builddir)/phar.phar diff --git a/ext/phar/package.php b/ext/phar/package.php index 1acd2ae838..42fdfe8a49 100644 --- a/ext/phar/package.php +++ b/ext/phar/package.php @@ -5,7 +5,6 @@ $notes = ' $a = new Phar(\'blah.phar\'); * fix creation and read of Phar objects on Windows, manage windows path separators (on windows only) - * fix Bug #11950: make pharcmd use installed phar.so, not build one [remicollet] * fix Bug #12492: filenew incorrectly creates file path [urkle] * fix Bug #12493: extract throws an error and won\'t open the file [urkle] '; |