summaryrefslogtreecommitdiff
path: root/automake.head.mk
diff options
context:
space:
mode:
Diffstat (limited to 'automake.head.mk')
-rw-r--r--automake.head.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/automake.head.mk b/automake.head.mk
index c79da83..37d3b07 100644
--- a/automake.head.mk
+++ b/automake.head.mk
@@ -30,13 +30,10 @@ am_path = $(foreach p,$1,$(call _am_relto,$p))
all: build
.PHONY: all
-## Set topoutdir, outdir, and srcdir (assumes that topsrcdir is
-## already set, and that $(topoutdir)/config.mk has been included)
-ifeq ($(topoutdir),)
-topoutdir := $(call _am_path,$(dir $(lastword $(filter %/config.mk config.mk,$(MAKEFILE_LIST)))))
-endif
- outdir := $(call _am_path,$(dir $(lastword $(filter-out %.mk,$(MAKEFILE_LIST)))))
- srcdir := $(call _am_path,$(topsrcdir)/$(call _am_relto,$(topoutdir),$(outdir)))
+## Set outdir and srcdir (assumes that topoutdir and topsrcdir are
+## already set)
+outdir := $(call _am_path,$(dir $(lastword $(filter-out %.mk,$(MAKEFILE_LIST)))))
+srcdir := $(call _am_path,$(topsrcdir)/$(call _am_relto,$(topoutdir),$(outdir)))
_am_included_makefiles := $(_am_included_makefiles) $(call _am_path,$(outdir)/Makefile)