summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-aux/Makefile.head.mk5
-rw-r--r--build-aux/Makefile.tail.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/build-aux/Makefile.head.mk b/build-aux/Makefile.head.mk
index 11b1374..36c2c0a 100644
--- a/build-aux/Makefile.head.mk
+++ b/build-aux/Makefile.head.mk
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This bit only gets evaluated once, at the very beginning
-ifeq ($(_at.NO_ONCE),)
+ifeq ($(origin _at.NO_ONCE),undefined)
ifeq ($(topsrcdir),)
$(error topsrcdir must be set before including Makefile.head.mk)
@@ -50,6 +50,9 @@ _at.reverse = $(if $1,$(call _at.reverse,$(_at.rest))) $(firstword $1)
at.dirlocal += at.subdirs
at.dirlocal += at.depdirs
+_at.outdirs ?=
+_at.included_makefiles ?=
+
include $(sort $(wildcard $(topsrcdir)/build-aux/Makefile.once.head/*.mk))
endif # _at.NO_ONCE
diff --git a/build-aux/Makefile.tail.mk b/build-aux/Makefile.tail.mk
index 38f40c2..a8b3d89 100644
--- a/build-aux/Makefile.tail.mk
+++ b/build-aux/Makefile.tail.mk
@@ -40,7 +40,7 @@ $(foreach _at.NO_ONCE,y,\
$(eval include $(filter-out $(_at.included_makefiles),$(makefile)))))
# This bit only gets evaluated once, after all of the other Makefiles are read
-ifeq ($(_at.NO_ONCE),)
+ifeq ($(origin _at.NO_ONCE),undefined)
outdir = /bogus
srcdir = /bogus