aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-05-13 22:38:41 +0200
committerJohannes Sixt <j6t@kdbg.org>2025-05-14 17:55:11 +0200
commit9f27318f148f7dbf6d837caea094dbd6490b8baa (patch)
tree98a986af7098a38552a5fe4f8ac4b218786395cc
parent3fdbf184be906b5f6abb35c02842ec8ad861e8f9 (diff)
downloadgit-9f27318f148f7dbf6d837caea094dbd6490b8baa.tar.gz
gitk: place file name arguments after options in msgfmt call
The build process fails in POSIXLY_CORRECT mode: $ gitk@master:1005> POSIXLY_CORRECT=1 make * new Tcl/Tk interpreter location GEN gitk-wish Generating catalog po/zh_cn.msg msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/ msgfmt: --tcl requires a "-l locale" specification Try 'msgfmt --help' for more information. make: *** [Makefile:76: po/zh_cn.msg] Error 1 The reason is that option arguments cannot occur after the first non-option argument. Move the file name last. Reported-by: Nathan Royce <nroycea+kernel@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3a3c56c318..cc32dcab4b 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ update-po:: $(PO_TEMPLATE)
$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
$(ALL_MSGFILES): %.msg : %.po
@echo Generating catalog $@
- $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
+ $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<
.PHONY: all install uninstall clean update-po
.PHONY: FORCE