From 47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Mon, 5 Aug 2013 15:38:36 -0700
Subject: [PATCH] NEWS for recent DTrace merges. Remove redundant 'cp' during
 DTrace install.

---
 NEWS         | 4 ++++
 acinclude.m4 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 332d4e79f7..103abeb092 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
     limited case). (Arpad)
   . Improve fix for bug #63186 (compile failure on netbsd). (Matteo)
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+    Zend/zend_dtrace.d) (Chris Jones)
+  . Cherry picked some DTrace build commits (allowing builds on Linux,
+    bug 62691, and bug 63706) from PHP 5.5 branch
 
 - Session:
   . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
diff --git a/acinclude.m4 b/acinclude.m4
index 76845d6f73..f7da55ce58 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 \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
-- 
2.49.0