diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/gnu/Makefile | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 16b7122072..ef12cc0e28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-19 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/gnu/Makefile: Make sure the correct errlist.c file is + used when generating errlist-compat.c. + 2005-12-18 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.c: Demangle pointers before use if necessary. diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile index a0b3e6e420..2b3194f04a 100644 --- a/sysdeps/gnu/Makefile +++ b/sysdeps/gnu/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004 +# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004, 2005 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -32,12 +32,14 @@ endif ifeq ($(subdir),stdio-common) -vpath errlist.c $(full_config_sysdirs) +errlist-c = $(firstword $(wildcard $(addsuffix /errlist.c, \ + $(full_config_sysdirs) .))) + ifeq ($(versioning),yes) -$(objpfx)errlist-compat.c: errlist.c $(..)sysdeps/gnu/errlist-compat.awk \ +$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \ $(common-objpfx)Versions.v.i $(before-compile) else -$(objpfx)errlist-compat.c: errlist.c $(..)sysdeps/gnu/errlist-compat.awk \ +$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \ $(before-compile) endif $(make-target-directory) |