From: Sascha Schumann <sas@php.net>
Date: Sat, 6 Nov 1999 13:05:14 +0000 (+0000)
Subject: - limit find to PHP's automake Makefiles
X-Git-Tag: php-4.0b3_RC2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14a870e940f8ab4da0cd4b7fc059e46848f23462;p=php

- limit find to PHP's automake Makefiles
- check whether patches were applied correctly
---

diff --git a/build.mk b/build.mk
index 75d90a9465..8341a47a87 100644
--- 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