diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-05-08 11:27:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-05-08 11:27:14 -0700 |
| commit | 95afbbe5fcf1b9eca04c05368d6c546b883007cb (patch) | |
| tree | 0db234d0ca9c4a4539ecc4ba2cfe9c5167ff3dd4 /Makeconfig | |
| parent | 7a1a51b51341e0d0a35bf021e4104e0c9ae5bf63 (diff) | |
Some configure-related decrufting.
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makeconfig b/Makeconfig index f9653983b6..2df4c88e1a 100644 --- a/Makeconfig +++ b/Makeconfig @@ -86,12 +86,12 @@ $(common-objpfx)config.make: $(common-objpfx)config.status \ $(common-objpfx)config.status: $(..)version.h $(..)configure \ $(foreach dir,$(sysdirs),\ $(wildcard $(dir)/Implies) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(firstword $(wildcard \ $(addprefix $(dir)/,configure configure.ac))))) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.ac)) \ - $(patsubst %.in,%,\ + $(patsubst %.ac,%,\ $(foreach add-on,$(add-ons),\ $(firstword $(wildcard \ $(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\ @@ -1049,7 +1049,7 @@ ifndef avoid-generated # existing directory not in all-subdirs, then sysd-sorted needs to # be regenerated, so it depends on existing $(sorted-subdirs:=/Depend) files. all-Depend-files := $(wildcard $(sort \ - $(foreach dir,$(all-subdirs),\ + $(foreach dir,$(all-subdirs),\ $(firstword $($(dir)-srcdir) \ $(..)$(dir))/Depend) \ $(sorted-subdirs:=/Depend))) |