diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-04 13:22:40 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-04 13:22:40 -0500 |
| commit | ed29df6355d6b1871aa60fec63c929ffe81fe62d (patch) | |
| tree | e48c4a83f675ec13f4cfb0242fa4a3da36524661 /automake.head.mk | |
| parent | d06e79cb18849df48e3e2b431c8b5fe6a32d3b6c (diff) | |
| parent | 37ef1295bf8885876df8de989569a2233f97583f (diff) | |
Merge remote-tracking branch 'automake/master'
Diffstat (limited to 'automake.head.mk')
| -rw-r--r-- | automake.head.mk | 11 |
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) |