- limit find to PHP's automake Makefiles

- check whether patches were applied correctly

diff --git a/build.mk b/build.mk
index 75d90a94653127e491b6743b0e2edcd959fc9f3f..8341a47a871c6cf4008ef8383aeacedd18aa06b0 100644 (file)
--- a/build.mk
+++ b/build.mk
@@ -17,7 +17,7 @@ LT_PATCHES = patch-aa patch-ab
 
 SUBDIRS = libzend TSRM
 
-makefile_am_files = $(shell find . -name Makefile.am)
+makefile_am_files = Makefile.am $(shell find ext sapi regex -name Makefile.am)
 makefile_in_files = $(makefile_am_files:.am=.in)
 makefile_files    = $(makefile_am_files:e.am=e)
 
@@ -68,6 +68,10 @@ $(LT_TARGETS): $(LT_PATCHES)
        libtoolize --automake -c -f
        patch ltconfig < patch-aa
        patch ltmain.sh < patch-ab
+       @grep compile_rpath ltconfig >/dev/null 2>&1 || (\
+                       echo "patching libtool components failed."; \
+                       exit 1)
+                       
 
 $(makefile_in_files): $(makefile_am_files) aclocal.m4
        @echo rebuilding Makefile.in\'s