summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-21 00:23:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-21 00:23:37 (GMT)
commitb9fa3ba0ca0e82e69ae111e5e911464bd0488fb3 (patch)
treebfc93ba8326eaa2f159d9bc8ab9d21cb3e23ff0a /Makefile
parent092bf77e8cc1717b1924d6acb85f2d34bce09f50 (diff)
parent56550ea718091e5868fdb241b5dfa882923db70c (diff)
downloadgit-b9fa3ba0ca0e82e69ae111e5e911464bd0488fb3.zip
git-b9fa3ba0ca0e82e69ae111e5e911464bd0488fb3.tar.gz
git-b9fa3ba0ca0e82e69ae111e5e911464bd0488fb3.tar.bz2
Merge branch 'sg/bugreport-fixes'
The dependencies for config-list.h and command-list.h were broken when the former was split out of the latter, which has been corrected. * sg/bugreport-fixes: Makefile: add missing dependencies of 'config-list.h'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b8a7e85..0447d12 100644
--- a/Makefile
+++ b/Makefile
@@ -2204,13 +2204,13 @@ $(BUILT_INS): git$X
config-list.h: generate-configlist.sh
-config-list.h:
+config-list.h: Documentation/*config.txt Documentation/config/*.txt
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
>$@+ && mv $@+ $@
command-list.h: generate-cmdlist.sh command-list.txt
-command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
+command-list.h: $(wildcard Documentation/git*.txt)
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
command-list.txt >$@+ && mv $@+ $@