Fixed bug #62691 (solaris sed has no -i switch)

Make 'make distclean' remove generated DTrace .h file

diff --git a/Makefile.global b/Makefile.global
index 5118de83fe45343c7a8b8cc0a6730512d1df7c74..b714a654ca1a0c911dd52e3a48cb5d3b5b94e6fe 100644 (file)
--- 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

diff --git a/NEWS b/NEWS
index 78f6539f8390c13a6f893dfa949e025cedc8521b..6fe5c3a763c990172d54f2ea1487f1d5d4e6430e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,9 @@ PHP                                                                        NEWS
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
     limited case). (Arpad)
+  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
 
-- OPcahce:
+- OPcache:
   . Added opcache.restrict_api configuration directive that may limit
     usage of OPcahce API functions only to patricular script(s). (Dmitry)
   . Added support for glob symbols in blacklist entries (?, *, **).

diff --git a/acinclude.m4 b/acinclude.m4
index 6c97dc37c60aa33d48539a602f3dfeb8dc2224a2..07b1f8eb57aee72239d4cb3ad128a93a6caeb48c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2965,7 +2965,7 @@ dnl Generate Makefile.objects entries
   cat>>Makefile.objects<<EOF
 
 $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