From 401598a05c210e3993f73b8ae71d40277c7f6516 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 13 Apr 2017 23:05:01 +0000 Subject: [PATCH] subtree.mk: Inhibit warning for non-git repos Signed-off-by: Jan Lindemann --- make/subtree.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/subtree.mk b/make/subtree.mk index 50ccd96c..ebb67441 100644 --- a/make/subtree.mk +++ b/make/subtree.mk @@ -19,8 +19,8 @@ endif #SUBTREE_SRC = $(shell find .) #endif -SUBTREE_DIRS = $(shell for f in `git ls-files . || find | sed 's%/[^/]\+$$%%' | sort -u | grep -v Makefile`; do if [ -d "$$f" ]; then echo $$f; fi; done) -SUBTREE_FILES = $(shell for f in `git ls-files . || find | grep -v Makefile`; do if [ -f "$$f" ]; then echo $$f; fi; done) +SUBTREE_DIRS = $(shell for f in `git ls-files . 2>/dev/null || find | sed 's%/[^/]\+$$%%' | sort -u | grep -v Makefile`; do if [ -d "$$f" ]; then echo $$f; fi; done) +SUBTREE_FILES = $(shell for f in `git ls-files . 2>/dev/null || find | grep -v Makefile`; do if [ -f "$$f" ]; then echo $$f; fi; done) INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS)) INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES))