Backport a Git GUI change that was included in Git v2.39.0-rc2

[dscho]

The Makefile of Git GUI was modified as part of a larger patch in git/git instead of the more canonical approach of applying the patch to Git GUI first and then requesting to pull Git GUI into Git.

Let's backport the Git GUI-specific part back into Git GUI.

[prati0100]

This is a partial backport of cddd68ae3366 (cocci: avoid "should ... be a metavariable" warnings, 2022-11-30), which had been applied directly to git/git.

Huh? This commit has nothing to do with this patch. Do you instead mean 67b36879fc ("Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4")?

The backport itself looks good to me, thanks for posting it.

[dscho]

Huh? This commit has nothing to do with this patch. Do you instead mean 67b36879fc ("Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4")?

You're absolutely correct, sorry about that, it was a copy/paste fail. I force-pushed a fixed commit:

• 1: f27e0b00978 ! 1: a5a3acdcd46 Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4

  @@ Commit message
      will always contain leading whitespace if there are no short options,
      but long options are present.
  
  -    This is a partial backport of cddd68ae3366 (cocci: avoid "should ... be
  -    a metavariable" warnings, 2022-11-30), which had been applied directly
  -    to git/git.
  +    This is a partial backport of 67b36879fc0 (Makefiles: change search
  +    through $(MAKEFLAGS) for GNU make 4.4, 2022-11-30), which had been
  +    applied directly to git/git.
  
      Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
      Signed-off-by: Junio C Hamano <gitster@pobox.com>

[prati0100]

Applied. Thanks for the patch.