com php-src: Merge branch 'PHP-5.5': Makefile.global
| From: | Christopher Jones | Date: | Thu, 01 Aug 2013 16:22:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72804@lists.php.net to get a copy of this message | ||
Commit: 9cd1ac7b61a473232d867c3eb69bfb8525f0d951
Author: Christopher Jones <sixd@php.net> Thu, 1 Aug 2013 09:22:47 -0700
Parents: 1c91ca990ff673edf8aa521285986759996f0cca d884ec15e93fa153c845961f5e4c35ef9240eedd
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=9cd1ac7b61a473232d867c3eb69bfb8525f0d951
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Clean up the 'generated' phar..inc file. When building outside the source tree the
copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is
part of the source. See the copying logic in ext/phar/Makefile.frag.
Changed paths:
MM Makefile.global
Diff: