kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tb/new-make-fix' 

Workaround the overly picky HT/SP rule in newer GNU Make.

* tb/new-make-fix:
  Makefile: remove accidental recipe prefix in conditional
maint
Junio C Hamano 2025-02-25 14:19:35 -08:00
parent f52abcda95 f23179924b
commit 5ce6e0e242
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1704,16 +1704,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)


ifdef ZLIB_NG ifdef ZLIB_NG
BASIC_CFLAGS += -DHAVE_ZLIB_NG BASIC_CFLAGS += -DHAVE_ZLIB_NG
ifdef ZLIB_NG_PATH ifdef ZLIB_NG_PATH
BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include
EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib)) EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib))
endif endif
EXTLIBS += -lz-ng EXTLIBS += -lz-ng
else else
ifdef ZLIB_PATH ifdef ZLIB_PATH
BASIC_CFLAGS += -I$(ZLIB_PATH)/include BASIC_CFLAGS += -I$(ZLIB_PATH)/include
EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib)) EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib))
endif endif
EXTLIBS += -lz EXTLIBS += -lz
endif endif