summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-aux/Makefile.tail.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/build-aux/Makefile.tail.mk b/build-aux/Makefile.tail.mk
index be3a8c2..38f40c2 100644
--- a/build-aux/Makefile.tail.mk
+++ b/build-aux/Makefile.tail.mk
@@ -17,13 +17,14 @@
include $(call _at.reverse,$(sort $(wildcard $(topsrcdir)/build-aux/Makefile.each.tail/*.mk)))
-at.subdirs := $(call at.addprefix,$(outdir)/,$(at.subdirs))
-at.depdirs := $(call at.addprefix,$(outdir)/,$(at.depdirs))
-
# Move all of the dirlocal variables to their namespaced version
$(foreach v,$(at.dirlocal),$(eval $v/$(outdir) := $$($v)))
$(foreach v,$(at.dirlocal),$(eval undefine $v))
+# Adjust subdirs and depdirs to be relative to $(outdir)
+at.subdirs/$(outdir) := $(sort $(patsubst %/,%,$(call at.addprefix,$(outdir)/,$(at.subdirs/$(outdir)))))
+at.depdirs/$(outdir) := $(sort $(patsubst %/,%,$(call at.addprefix,$(outdir)/,$(at.depdirs/$(outdir)))))
+
# Remember that this is a directory that we've visited
_at.outdirs := $(_at.outdirs) $(outdir)