Skip to content

Commit f231799

Browse files
ttaylorrgitster
authored andcommitted
Makefile: remove accidental recipe prefix in conditional
Back in 728b9ac (Makefile(s): avoid recipe prefix in conditional statements, 2024-04-08), we prepared our Makefiles for a forthcoming change in upstream Make that would ban the recipe prefix within a conditional statement by replacing tabs (the prefix) with eight spaces. In b9d6f64 (compat/zlib: allow use of zlib-ng as backend, 2025-01-28), a handful of recipe prefix characters were introduced in a conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my system, which uses GNU Make 4.4.90. Remove the recipe prefix characters by replacing them with the same script as is mentioned in 728b9ac. Signed-off-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 78cdeed commit f231799

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,16 +1690,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
16901690

16911691
ifdef ZLIB_NG
16921692
BASIC_CFLAGS += -DHAVE_ZLIB_NG
1693-
ifdef ZLIB_NG_PATH
1693+
ifdef ZLIB_NG_PATH
16941694
BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include
16951695
EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib))
1696-
endif
1696+
endif
16971697
EXTLIBS += -lz-ng
16981698
else
1699-
ifdef ZLIB_PATH
1699+
ifdef ZLIB_PATH
17001700
BASIC_CFLAGS += -I$(ZLIB_PATH)/include
17011701
EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib))
1702-
endif
1702+
endif
17031703
EXTLIBS += -lz
17041704
endif
17051705

0 commit comments

Comments
 (0)