Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
	ChangeLog

2 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 03ba71f859..f8e36af74e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,13 @@
 	* sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise.
 	* math/libm-test.inc (cproj_test): Fix test.
 
+2010-04-08  Roland McGrath  <roland@redhat.com>
+
+	* Makerules (libc-abis): Variable removed.
+	($(common-objpfx)libc-abis.h): Depend on Makerules too.
+	Use automatic variables in commands.
+	Depend on first libc-abis from $(sysdirs) or $(..).
+
 2010-04-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/bug-getopt1.c: New file.
diff --git a/Makerules b/Makerules
index 9c15a27a5d..bf03b38a9c 100644
--- a/Makerules
+++ b/Makerules
@@ -111,13 +111,13 @@ endif # $(versioning) = yes
 
 ifndef avoid-generated
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \
-				    $(..)$D/libc-abis)) \
-			 $(..)libc-abis)
-$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
-	$(SHELL) $(..)scripts/gen-libc-abis \
+$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis \
+			     $(firstword $(wildcard $(sysdirs:=/libc-abis)) \
+					 $(..)libc-abis) \
+			     $(..)Makerules
+	$(SHELL) $< \
 		 $(base-machine)-$(config-vendor)-$(config-os) \
-		 < $(libc-abis) > $@T
+		 < $(word 2,$^) > $@T
 	$(move-if-change) $@T $@
 common-generated += $(common-objpfx)libc-abis.h
 endif # avoid-generated