diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-31 10:00:05 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-31 10:00:05 -0700 |
| commit | f5521a357ad77fd71e6e783711c206a063bfebb3 (patch) | |
| tree | 34e55baa3791ff13efe53b45da67240681476b39 /Makefile.global | |
| parent | f3c3aa8a676518728d3dab90deb03f3354113b0f (diff) | |
| parent | e3a4b87e899ac55995f783e52379801973e199e7 (diff) | |
| download | php-git-f5521a357ad77fd71e6e783711c206a063bfebb3.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global index ff3bf2279a..09584c43fc 100644 --- a/Makefile.global +++ b/Makefile.global @@ -118,7 +118,7 @@ clean: rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f .PHONY: all clean install distclean test |