diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-16 14:50:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-16 14:50:29 -0700 |
| commit | 2b49e41155d826d40ede07dfd4d34a7a36f9f64b (patch) | |
| tree | 12ccb6f06f769e3d57c52298e1dad66127abf74b /gitk-git/Makefile | |
| parent | a7589384d5a54f9c135c19bd8bc5b04715cc2865 (diff) | |
| parent | 227b8fd9024084209fc5fb24f89f3abe8c51592f (diff) | |
| download | git-2b49e41155d826d40ede07dfd4d34a7a36f9f64b.tar.xz | |
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
Diffstat (limited to 'gitk-git/Makefile')
| -rw-r--r-- | gitk-git/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk-git/Makefile b/gitk-git/Makefile index 5bdd52a6eb..e1f0aff4a1 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -33,9 +33,9 @@ ifdef NO_MSGFMT MSGFMT ?= $(TCL_PATH) po/po2msg.sh else MSGFMT ?= msgfmt - ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) MSGFMT := $(TCL_PATH) po/po2msg.sh - endif + endif endif PO_TEMPLATE = po/gitk.pot |