Merge branch 'rj/hdr-check-gcrypt-fix'

diff --git a/Makefile b/Makefile
index 148668368bf1708900bf4a62120004747718e8c9..acd6791faadb2b3b775d6706ff6c5dd69a09260c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2749,7 +2749,10 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
 sparse: $(SP_OBJ)
 
 GEN_HDRS := command-list.h unicode-width.h
-EXCEPT_HDRS := $(GEN_HDRS) compat% xdiff%
+EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
+ifndef GCRYPT_SHA256
+       EXCEPT_HDRS += sha256/gcrypt.h
+endif
 CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
 HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))