From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2024 21:50:29 +0000 (-0700)
Subject: Merge branch 'tb/make-indent-conditional-with-non-spaces'
X-Git-Tag: v2.45.0-rc0~7
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=2b49e41155d826d40ede07dfd4d34a7a36f9f64b

Merge branch 'tb/make-indent-conditional-with-non-spaces'

Adjust to an upcoming changes to GNU make that breaks our Makefiles.

* tb/make-indent-conditional-with-non-spaces:
  Makefile(s): do not enforce "all indents must be done with tab"
  Makefile(s): avoid recipe prefix in conditional statements
---

2b49e41155d826d40ede07dfd4d34a7a36f9f64b
diff --cc config.mak.uname
index fcf3e2d785,cc5660e925..a7607a5676
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -637,22 -638,10 +637,22 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
  	SHELL_PATH = /usr/coreutils/bin/bash
  endif
 +ifeq ($(uname_S),OS/390)
 +	NO_SYS_POLL_H = YesPlease
 +	NO_STRCASESTR = YesPlease
 +	NO_REGEX = YesPlease
 +	NO_MMAP = YesPlease
 +	NO_NSEC = YesPlease
 +	NO_STRLCPY = YesPlease
 +	NO_MEMMEM = YesPlease
 +	NO_GECOS_IN_PWENT = YesPlease
 +	HAVE_STRINGS_H = YesPlease
 +	NEEDS_MODE_TRANSLATION = YesPlease
 +endif
  ifeq ($(uname_S),MINGW)
- 	ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
+         ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
  		$(error "Building with MSys is no longer supported")
- 	endif
+         endif
  	pathsep = ;
  	HAVE_ALLOCA_H = YesPlease
  	NO_PREAD = YesPlease