summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2019-09-16 12:23:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-17 14:32:36 -0700
commit43f8c890fd132a2468093b65b55933d8f118896c (patch)
tree5cfb6c20e1022117728f8a0a717cedb317e32ace /Makefile
parentMakefile: define THIRD_PARTY_SOURCES (diff)
downloadtgif-43f8c890fd132a2468093b65b55933d8f118896c.tar.xz
Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
Currently, $(FIND_SOURCE_FILES) has two modes: if `git ls-files` is present, it will use that to enumerate the files in the repository; else it will use `$(FIND) .` to enumerate the files in the directory. There is a subtle difference between these two methods, however. With ls-files, filenames don't have a leading `./` while with $(FIND), they do. This does not currently pose a problem but in a future patch, we will be using `filter-out` to process the list of files with the assumption that there is no prefix. Unify the two possible invocations in $(FIND_SOURCE_FILES) by using sed to remove the `./` prefix in the $(FIND) case. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 64a5981280..6dbc4ecfec 100644
--- a/Makefile
+++ b/Makefile
@@ -2614,6 +2614,7 @@ FIND_SOURCE_FILES = ( \
-o \( -name 'trash*' -type d -prune \) \
-o \( -name '*.[hcS]' -type f -print \) \
-o \( -name '*.sh' -type f -print \) \
+ | sed -e 's|^\./||' \
)
$(ETAGS_TARGET): FORCE