From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 20 Mar 2010 06:24:58 GMT
Subject: [PATCH squash] gitk: Update makefile to keep -encoding option for gitk-wish
Message-ID: <20100320062427.GA26434@progeny.tock>
In-Reply-To: <20100320061452.GA26224@progeny.tock>

Jonathan Nieder wrote:

> I can reproduce this in Linux with LANG=de_DE@euro ./gitk.

This should be squashed in to fix LANG=de_DE@euro ./gitk-wish, too.
Sorry for the trouble.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index e1b6045..1cc922c 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ clean::
 
 gitk-wish: gitk
 	$(QUIET_GEN)$(RM) $@ $@+ && \
-	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
+	sed -e '1,3s|^exec .* -encoding|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) -encoding|' <gitk >$@+ && \
 	chmod +x $@+ && \
 	mv -f $@+ $@
 
-- 
1.7.0.2