From 967e4eb92e3b7ce2bd92f18a84ecdc3f8bb39ed3 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 3 May 2009 20:29:17 -0400 Subject: [PATCH] [git.mk] Fix DEST_SUBDIR recursion --- git.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/git.mk b/git.mk index b9b077f..2e23c0a 100644 --- a/git.mk +++ b/git.mk @@ -164,15 +164,16 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk LANG=C sort | uniq > $@.tmp && \ mv $@.tmp $@; -all: $(srcdir)/.gitignore gitignore-recurse -gitignore-recurse: +all: $(srcdir)/.gitignore gitignore-recurse-maybe +gitignore-recurse-maybe: @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \ - done; \ + $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ fi; +gitignore-recurse: + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \ + done maintainer-clean: gitignore-clean gitignore-clean: -rm -f $(srcdir)/.gitignore -.PHONY: gitignore-clean gitignore-recurse - +.PHONY: gitignore-clean gitignore-recurse gitignore-recurse-maybe -- 2.7.4