diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-17 02:20:31 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-17 02:22:05 -0500 |
| commit | dd98e1c994520acc817d3dfa651ccf291827630d (patch) | |
| tree | 8a5badbc1b1135cfb5357ea3aca5e82d4c5f0578 /build-aux/Makefile.head.mk | |
| parent | 2d33bd2f34f011c4f025a073b50d536f6a66a4db (diff) | |
Backport fixes from work on parabola-hackers.git.
- core: Actually support at.Makefile; how it set the internal variable
_at.MAKEFILE_LIST was broken if $(at.Makefile) != Makefile
- mod: dist:
* Don't try to distribute $(files.src.int) files.
* Add a comment noting that the lack of the `-P` flag to `cp` is not a
bug.
- mod: gitfiles:
* Correctly list files in $(topsrcdir).
* Also enumerate files in git submodules.
Diffstat (limited to 'build-aux/Makefile.head.mk')
| -rw-r--r-- | build-aux/Makefile.head.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build-aux/Makefile.head.mk b/build-aux/Makefile.head.mk index e6b4a19..f4eb51d 100644 --- a/build-aux/Makefile.head.mk +++ b/build-aux/Makefile.head.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2016 Luke Shumaker +# Copyright (C) 2015-2017 Luke Shumaker # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -13,8 +13,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +at.Makefile ?= Makefile _at.MAKEFILE_LIST ?= -_at.MAKEFILE_LIST := $(strip $(_at.MAKEFILE_LIST) $(abspath $(lastword $(filter-out %.mk,$(MAKEFILE_LIST))))) +_at.MAKEFILE_LIST := $(strip $(_at.MAKEFILE_LIST) $(lastword $(filter %/$(at.Makefile),$(abspath $(MAKEFILE_LIST))))) # This bit only gets evaluated once, at the very beginning ifeq ($(origin _at.NO_ONCE),undefined) @@ -86,9 +87,6 @@ define at.nl endef -# External configuration ############################################### -at.Makefile ?= Makefile - # Include modules ###################################################### include $(sort $(wildcard $(topsrcdir)/build-aux/Makefile.once.head/*.mk)) _at.tmp_targets = |