From dd98e1c994520acc817d3dfa651ccf291827630d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 17 Jan 2017 02:20:31 -0500
Subject: 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.
---
 build-aux/Makefile.once.head/00-gitfiles.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'build-aux/Makefile.once.head')

diff --git a/build-aux/Makefile.once.head/00-gitfiles.mk b/build-aux/Makefile.once.head/00-gitfiles.mk
index dbb4ae9..8566a7f 100644
--- a/build-aux/Makefile.once.head/00-gitfiles.mk
+++ b/build-aux/Makefile.once.head/00-gitfiles.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Luke Shumaker
+# Copyright (C) 2016-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
@@ -65,10 +65,11 @@ _gitfiles.all =
 
 ifneq ($(wildcard $(topsrcdir)/.git),)
 $(topsrcdir)/$(gitfiles.file): _gitfiles.FORCE
-	@(cd $(@D) && git ls-files -z) | sed -z -e 's/\$$/\$$$$/g' -e 's/\n/$$(at.nl)/g' | xargs -r0 printf '_gitfiles.all+=%s\n' | $(WRITE_IFCHANGED) $@
+	@(cd $(@D) && git ls-files --recurse-submodules -z) | sed -z -e 's/\$$/\$$$$/g' -e 's/\n/$$(at.nl)/g' | xargs -r0 printf '_gitfiles.all+=%s\n' | $(WRITE_IFCHANGED) $@
 .PHONY: _gitfiles.FORCE
 endif
 
 _gitfiles.dir = $(call at.relto,$(topsrcdir),$(srcdir))
-_gitfiles.dir.all = $(patsubst $(_gitfiles.dir)/%,%,$(filter $(_gitfiles.dir)/%,$(_gitfiles.all)))
+_gitfiles.pat = $(patsubst ./%,%,$(_gitfiles.dir)/%)
+_gitfiles.dir.all = $(patsubst $(_gitfiles.pat),%,$(filter $(_gitfiles.pat),$(_gitfiles.all)))
 _gitfiles.dir.src = $(filter-out $(addsuffix /%,$(nested.subdirs)),$(_gitfiles.dir.all))
-- 
cgit v1.2.2