From 13074b5b5ad49a84c56a7e83070edfc9f44d6a13 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 19 Aug 2008 00:19:03 +0000 Subject: [PATCH] * Makefile (check-data): Check data directory in add-ons. * elf/Makefile (check-data): Likewise. --- ChangeLog | 5 +++++ Makefile | 4 ++-- elf/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a5c039..203349f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-18 Daniel Jacobowitz + + * Makefile (check-data): Check data directory in add-ons. + * elf/Makefile (check-data): Likewise. + 2008-08-18 Roland McGrath * configure.in (--with-cpu): Check compiler support for -march/-mcpu. diff --git a/Makefile b/Makefile index 437854e..8b405a4 100644 --- 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 --- 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) \ -- 2.7.4