diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makeconfig | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a86ce03a76..d07f5e2ac2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-08 Roland McGrath <roland@hack.frob.com> + + * Makeconfig ($(common-objpfx)config.status): Depend on + sysdeps/*/preconfigure{,.in} too. + 2013-03-08 Joseph Myers <joseph@codesourcery.com> * malloc/malloc.h (__malloc_ptr_t): Remove macro. diff --git a/Makeconfig b/Makeconfig index 79035e3906..6c8891827e 100644 --- a/Makeconfig +++ b/Makeconfig @@ -90,10 +90,14 @@ $(common-objpfx)config.status: $(..)version.h $(..)configure \ $(firstword $(wildcard \ $(addprefix $(dir)/,configure configure.in))))) \ $(patsubst %.in,%,\ + $(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.in)) \ + $(patsubst %.in,%,\ $(foreach add-on,$(add-ons),\ $(firstword $(wildcard \ $(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\ - configure configure.in))))) + configure configure.in))) \ + $(wildcard $(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\ + sysdeps/*/preconfigure sysdeps/*/preconfigure.in)))) @cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \ echo The GNU C library has not been configured. >&2; \ echo Run \`configure\' to configure it before building. >&2; \ |