MFH: - Fixed bug #33017 ("make distclean" gives an error with VPATH build).

diff --git a/Makefile.global b/Makefile.global
index e30bc42f788228bad3d1008aa14afb5f07e652ce..c59751bc5af7090a7e2790a585f337cebe0739f4 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -69,7 +69,7 @@ clean:
 
 distclean: clean
        rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp
-       egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
+       egrep define'.*include/php' $(top_srcdir)/configure|sed 's/.*>//'|xargs rm -f
        find . -name Makefile | xargs rm -f
 
 .PHONY: all clean install distclean test

diff --git a/NEWS b/NEWS
index 1ff5c96cc4cd41552d95a9fbf1fab134c3dea81d..03573e09bee4249765f47c40d6a6e813467a6222 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP                                                                        NEWS
   RFC 2616 section 10.3.5) (Rasmus, Choitel)
 - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). 
   (jwozniak23 at poczta dot onet dot pl, Tony).
+- Fixed bug #33017 ("make distclean" gives an error with VPATH build). (Jani)
 - Fixed bug #33013 ("next month" was handled wrong while parsing dates).
   (Derick)
 - Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL). (Georg)