* Makefile (check-data): Check data directory in add-ons.

	* elf/Makefile (check-data): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5a5c039..203349f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-18  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * Makefile (check-data): Check data directory in add-ons.
+       * elf/Makefile (check-data): Likewise.
+
 2008-08-18  Roland McGrath  <roland@redhat.com>
 
        * configure.in (--with-cpu): Check compiler support for -march/-mcpu.

diff --git a/Makefile b/Makefile
index 437854e..8b405a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -247,8 +247,8 @@ tests-clean:
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
 check-data := $(firstword $(wildcard \
-               $(foreach D,$(add-ons) scripts/data,\
-                         $(patsubst %,$D/c++-types-%.data,\
+               $(foreach D,$(add-ons) scripts,\
+                         $(patsubst %,$D/data/c++-types-%.data,\
                                     $(abi-name) \
                                     $(addsuffix -$(config-os),\
                                                 $(config-machine) \

diff --git a/elf/Makefile b/elf/Makefile
index b89528c..c25a0c4 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -841,8 +841,8 @@ $(objpfx)tst-dlmodcount: $(libdl)
 $(objpfx)tst-dlmodcount.out: $(test-modules)
 
 check-data := $(firstword $(wildcard \
-               $(foreach D,$(add-ons) scripts/data,\
-                         $(patsubst %,$(..)$D/localplt-%.data,\
+               $(foreach D,$(add-ons) scripts,\
+                         $(patsubst %,$(..)$D/data/localplt-%.data,\
                                     $(abi-name) \
                                     $(addsuffix -$(config-os),\
                                                 $(config-machine) \