git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Pat Thoyts <patthoyts@users.sourceforge.net>
Cc: git@vger.kernel.org, Paul Mackerras <paulus@samba.org>
Subject: [PATCH squash] gitk: Update makefile to keep -encoding option for gitk-wish
Date: Sat, 20 Mar 2010 01:24:58 -0500	[thread overview]
Message-ID: <20100320062427.GA26434@progeny.tock> (raw)
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

  reply	other threads:[~2010-03-20  6:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-12 18:31 [PATCH 1/3] gitk: Avoid calling tk_setPalette on Windows Pat Thoyts
2010-03-12 18:31 ` [PATCH 2/3] gitk: Add emacs editor variable block Pat Thoyts
2010-03-12 18:31   ` [PATCH 3/3] gitk: fix display of copyright symbol Pat Thoyts
2010-03-20  6:14     ` [PATCH] gitk: Fix display of copyright symbol in non-utf-8 locales Jonathan Nieder
2010-03-20  6:24       ` Jonathan Nieder [this message]
2010-03-22 22:58       ` Pat Thoyts
2010-03-22 23:45         ` Jonathan Nieder
2010-03-20  6:32 ` [PATCH 1/3] gitk: Avoid calling tk_setPalette on Windows Jonathan Nieder
2010-03-22 22:52   ` Pat Thoyts
2010-03-23  2:29     ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100320062427.GA26434@progeny.tock \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=patthoyts@users.sourceforge.net \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).