diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-05 15:40:56 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-05 15:40:56 -0700 |
| commit | 18f17818a697269fbd93b9ec234640b67972eb23 (patch) | |
| tree | 1f247fe48bd9ddb9269b01a15fa83cbe11214295 | |
| parent | 6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d (diff) | |
| parent | 47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c (diff) | |
| download | php-git-18f17818a697269fbd93b9ec234640b67972eb23.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 335b1b44d0..b95e738d25 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 |