com php-src: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file: Makefile.global acinclude.m4

Commit: 3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692 Author: Christopher Jones <sixd@php.net> Wed, 31 Jul 2013 09:58:28 -0700 Parents: a5c524f1bee382bb5792069c7a0afac9abdcd3ce Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692 Log: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Bugs: https://bugs.php.net/62691 Changed paths: M Makefile.global M acinclude.m4 Diff: diff --git a/Makefile.global b/Makefile.global index b30c318..fe31eed 100644 --- a/Makefile.global +++ b/Makefile.global @@ -116,7 +116,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 diff --git a/acinclude.m4 b/acinclude.m4 index ae5509d..76845d6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2969,7 +2969,7 @@ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268) $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj