aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-01 07:13:03 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-01 07:13:03 +0000
commitb7e2d9a56b3f16b231c2370b589b11d3a322337b (patch)
tree945da0a7420081474f14599746bfef317993e80e
parent0fd43249a0c6d180a3a2ffc0ff850f6718592a6f (diff)
downloadglibc-b7e2d9a56b3f16b231c2370b589b11d3a322337b.tar
glibc-b7e2d9a56b3f16b231c2370b589b11d3a322337b.tar.gz
glibc-b7e2d9a56b3f16b231c2370b589b11d3a322337b.tar.bz2
glibc-b7e2d9a56b3f16b231c2370b589b11d3a322337b.zip
Always include sys-dirs, but disable rule to regenerate it when avoid-generated.
-rw-r--r--Makeconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makeconfig b/Makeconfig
index f46a933ba9..c86628433a 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -740,9 +740,7 @@ have-thread-library = yes
rpath-dirs += linuxthreads
endif
-ifndef avoid-generated
-include $(common-objpfx)sysd-dirs
-endif
# These are the subdirectories containing the library source. The order
# is more or less arbitrary. The sorting step will take care of the
@@ -770,6 +768,7 @@ endif
subdirs := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
$(filter-out mach hurd,$(subdirs))
+ifndef avoid-generated
all-Subdirs-files = $(wildcard $(config-sysdirs:%=$(..)%/Subdirs))
$(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files)
$(AWK) 'BEGIN { subdirs = ""; inhibit = "" }; \
@@ -796,5 +795,6 @@ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \
done \
) | $(AWK) -f $< > $@-tmp
mv -f $@-tmp $@
+endif
endif # Makeconfig not yet included