diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-25 14:19:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-25 14:19:35 -0800 |
| commit | 5ce6e0e2421af8aaa2be5684176a66388561d44e (patch) | |
| tree | 365d235cb837bc8974cc3d6ede87fcfa223be69a | |
| parent | f52abcda959c2fa83243be21041d289735379b7c (diff) | |
| parent | f23179924bf4ee0e888cfbe911d9bd472918bcb4 (diff) | |
| download | git-5ce6e0e2421af8aaa2be5684176a66388561d44e.tar.xz | |
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
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1704,16 +1704,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) ifdef ZLIB_NG BASIC_CFLAGS += -DHAVE_ZLIB_NG - ifdef ZLIB_NG_PATH + ifdef ZLIB_NG_PATH BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib)) - endif + endif EXTLIBS += -lz-ng else - ifdef ZLIB_PATH + ifdef ZLIB_PATH BASIC_CFLAGS += -I$(ZLIB_PATH)/include EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib)) - endif + endif EXTLIBS += -lz endif |