{"thread":{"id":"11539","subject":"[PATCH] gitk: Update and fix Makefile","startedAt":"2008-01-08T20:54:20Z","lastAt":"2008-01-13T21:06:51Z","messageCount":10,"participants":["Christian Stimming","Junio C Hamano","Paul Mackerras","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64781","messageId":"200801082154.21282.stimming@tuhh.de","threadId":"11539","inReplyTo":null,"subject":"[PATCH] gitk: Update and fix Makefile","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-01-08T20:54:20Z","receivedAt":"2008-01-08T20:54:20Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"This Makefile uses the template provided at git.git/gitk-git/Makefile\nby Junio and adds the rules for the i18n files.\n\nSigned-off-by: Christian Stimming \n---\nThis patch is against master of git.kernel.org.\n@Paul: Ignore my previous patch - \"make install\" didn't \nwork there, but it does here.\n\n Makefile | 63 +++++++++++++++++++++++++++++++++++++------------------------\n 1 files changed, 38 insertions(+), 25 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 38154b6..6158504 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1,25 +1,52 @@\n-# Set the installation directories; this section is needed only in\n-# gitk.git but probably not in git.git.\n-ifndef gitexecdir\n-\tgitexecdir := $(shell git --exec-path)\n-endif\n-ifndef sharedir\n-\tsharedir := $(dir $(gitexecdir))share\n-endif\n+# The default target of this Makefile is...\n+all::\n \n-# From here on, these are needed in git.git/gitk/Makefile.\n+prefix ?= $(HOME)\n+bindir ?= $(prefix)/bin\n+sharedir ?= $(prefix)/share\n gitk_libdir ?= $(sharedir)/gitk/lib\n msgsdir ?= $(gitk_libdir)/msgs\n msgsdir_SQ = $(subst ','\\'',$(msgsdir))\n \n-## Beginning of po-file creation rules\n+TCLTK_PATH ?= wish\n+INSTALL ?= install\n+RM ?= rm -f\n+\n+DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))\n+bindir_SQ = $(subst ','\\'',$(bindir))\n+TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n+\n+## po-file creation rules\n XGETTEXT ?= xgettext\n MSGFMT ?= msgfmt\n PO_TEMPLATE = po/gitk.pot\n ALL_POFILES = $(wildcard po/*.po)\n ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))\n \n-all:: $(ALL_MSGFILES)\n+ifndef V\n+\tQUIET = @\n+\tQUIET_GEN = $(QUIET)echo ' ' GEN $@ &&\n+endif\n+\n+all:: gitk-wish $(ALL_MSGFILES)\n+\n+install:: all\n+\t$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk\n+\t$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'\n+\t$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true\n+\n+uninstall::\n+\t$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true\n+\t$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk\n+\n+clean::\n+\t$(RM) gitk-wish po/*.msg\n+\n+gitk-wish: gitk\n+\t$(QUIET_GEN)$(RM) $@ $@+ && \\\n+\tsed -e '1,3s|^exec .* \"$$0\"|exec $(subst |,'\\|',$(TCLTK_PATH_SQ)) \"$$0\"|' $@+ && \\\n+\tchmod +x $@+ && \\\n+\tmv -f $@+ $@\n \n $(PO_TEMPLATE): gitk\n \t$(XGETTEXT) -kmc -LTcl -o $@ gitk\n@@ -29,17 +56,3 @@ $(ALL_MSGFILES): %.msg : %.po\n \t@echo Generating catalog $@\n \t$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)\n \n-clean::\n-\trm -f $(ALL_PROGRAMS) po/*.msg\n-## End of po-file creation rules\n-\n-# Install rules for po-files\n-install: all\n-\t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)\n-\t$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true\n-\n-uninstall:\n-\t$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true\n-\t$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)\n-\t$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)\n-\t$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)\n-- \n1.5.3.4.206.g58ba4\n"},{"id":"64794","messageId":"7vk5mkq669.fsf@gitster.siamese.dyndns.org","threadId":"11539","inReplyTo":"200801082154.21282.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-08T22:54:54Z","receivedAt":"2008-01-08T22:54:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Stimming writes:\n\n> -# From here on, these are needed in git.git/gitk/Makefile.\n> +prefix ?= $(HOME)\n> +bindir ?= $(prefix)/bin\n> +sharedir ?= $(prefix)/share\n> gitk_libdir ?= $(sharedir)/gitk/lib\n> msgsdir ?= $(gitk_libdir)/msgs\n> msgsdir_SQ = $(subst ','\\'',$(msgsdir))\n\nI see somwhat funny spacing there. I'd suggest giving up\naligning with spaces and consistently saying \"var ?= val\"\ninstead.\n\n\tI am reading the diff between the gitk-git/Makefile\n\tbefore and after merging gitk with your patch and\n\tthe last three lines above are not context but additions\n\tfrom my point of view.\n\n> +install:: all\n> +\t$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk\n> +\t$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'\n> +\t$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true\n\nThis is cute and correct (except I would have spelled \"true\" as\n\":\" myself). I think we need to fix a few such constructs that\nuse \";\" instead of \"&&\" in Makefile in git.git.\n\n> +uninstall::\n> +\t$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true\n> +\t$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk\n\nI have a mild dislike against uninstall target, but that's\nPaul's call.\n\n> +clean::\n> +\t$(RM) gitk-wish po/*.msg\n\nAnd this makes me wonder if the last token should be $(ALL_MSGFILES).\n\nOther than that, Ack from me.\n\nThanks.\n"},{"id":"64810","messageId":"18308.17099.334609.80415@cargo.ozlabs.ibm.com","threadId":"11539","inReplyTo":"7vk5mkq669.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-01-09T03:43:07Z","receivedAt":"2008-01-09T03:43:07Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Junio C Hamano writes:\n\n> I see somwhat funny spacing there. I'd suggest giving up\n> aligning with spaces and consistently saying \"var ?= val\"\n> instead.\n\nI made those lines all have one space before and after the ?=, and\ncommitted Christian's patches (plus one from Gerrit Pape), and pushed\nit out. Please do a pull.\n\nPaul.\n"},{"id":"64823","messageId":"7vy7azl8bs.fsf@gitster.siamese.dyndns.org","threadId":"11539","inReplyTo":"18308.17099.334609.80415@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-09T08:19:35Z","receivedAt":"2008-01-09T08:19:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Paul Mackerras writes:\n\n> Junio C Hamano writes:\n>\n>> I see somwhat funny spacing there. I'd suggest giving up\n>> aligning with spaces and consistently saying \"var ?= val\"\n>> instead.\n>\n> I made those lines all have one space before and after the ?=, and\n> committed Christian's patches (plus one from Gerrit Pape), and pushed\n> it out. Please do a pull.\n\nThere were a couple of things I noticed that made me somewhat curious:\n\n * There are more spaces around ?= in Christian's patch to Makefile.\n\n * You have two patches from Christian and one patch from\n Gerrit; the author and commit timestamps of these commits are\n the same and in your timezone.\n\nbut nothing to complain about. Pulled and pushed out.\n"},{"id":"64998","messageId":"7vk5mg3fjf.fsf@gitster.siamese.dyndns.org","threadId":"11539","inReplyTo":"18308.17099.334609.80415@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-11T08:57:56Z","receivedAt":"2008-01-11T08:57:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I applied three patches since last pull from you and pushed the\nresult (pure gitk part) out in gitk branch:\n\n\tmaster.kernel.org:/pub/scm/git/git.git/ gitk\n\nCould you please pull?\n"},{"id":"64999","messageId":"7vfxx43f5r.fsf@gitster.siamese.dyndns.org","threadId":"11539","inReplyTo":"7vk5mg3fjf.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-11T09:06:08Z","receivedAt":"2008-01-11T09:06:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> I applied three patches since last pull from you and pushed the\n> result (pure gitk part) out in gitk branch:\n>\n> \tmaster.kernel.org:/pub/scm/git/git.git/ gitk\n>\n> Could you please pull?\n\nSorry, this was a very ill-behaved pull request. The patches\npicked up from the list I applied are these three:\n\nCharles Bailey (1):\n gitk: Fix the Makefile to cope with systems lacking msgfmt\n\nChristian Stimming (2):\n gitk: Fix typo in user message.\n gitk: Update German translation.\n"},{"id":"65082","messageId":"18311.64910.643392.816623@cargo.ozlabs.ibm.com","threadId":"11539","inReplyTo":"7vfxx43f5r.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-01-11T23:36:46Z","receivedAt":"2008-01-11T23:36:46Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Junio C Hamano writes:\n> Junio C Hamano writes:\n> \n> > I applied three patches since last pull from you and pushed the\n> > result (pure gitk part) out in gitk branch:\n> >\n> > \tmaster.kernel.org:/pub/scm/git/git.git/ gitk\n> >\n> > Could you please pull?\n\nI get:\n\n~/gitk$ git pull master.kernel.org:/pub/scm/git/git.git/ gitk\nerror: no such remote ref refs/heads/gitk\nfatal: Fetch failure: master.kernel.org:/pub/scm/git/git.git/\n\n> Sorry, this was a very ill-behaved pull request. The patches\n> picked up from the list I applied are these three:\n> \n> Charles Bailey (1):\n> gitk: Fix the Makefile to cope with systems lacking msgfmt\n> \n> Christian Stimming (2):\n> gitk: Fix typo in user message.\n\nI was going to ignore this one since \"descendent\" is actually a valid\nalternate spelling, and is the one I am used to. However, I don't\nhave a strong feeling about it.\n\nPaul.\n"},{"id":"65085","messageId":"7vr6gn29w1.fsf@gitster.siamese.dyndns.org","threadId":"11539","inReplyTo":"18311.64910.643392.816623@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-11T23:57:34Z","receivedAt":"2008-01-11T23:57:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Paul Mackerras writes:\n\n> I get:\n>\n> ~/gitk$ git pull master.kernel.org:/pub/scm/git/git.git/ gitk\n> error: no such remote ref refs/heads/gitk\n> fatal: Fetch failure: master.kernel.org:/pub/scm/git/git.git/\n\nMy bash history tells me that I only did push --dry-run. Stupid\nme. Sorry about the noise.\n\n>> Christian Stimming (2):\n>> gitk: Fix typo in user message.\n>\n> I was going to ignore this one since \"descendent\" is actually a valid\n> alternate spelling, and is the one I am used to. However, I don't\n> have a strong feeling about it.\n\nI agree with you that both are valid spellings, but when I\nreceived 9e5d87d49070fe0463040e826824d6ce41beb089, I consulted a\ncouple of dictionaries and descendant seemed to be more widely\nused. Besides, I think the german translation update depends on\nit ;-).\n\nAnyway, I pushed it (this time without --dry-run) to\n\n master.kernel.org:/pub/scm/git/git.git/ gitk-for-paulus\n\nSorry, and thanks.\n"},{"id":"65123","messageId":"20080112050433.GD5211@coredump.intra.peff.net","threadId":"11539","inReplyTo":"7vr6gn29w1.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] gitk: Update and fix Makefile","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-01-12T05:04:33Z","receivedAt":"2008-01-12T05:04:33Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Jan 11, 2008 at 03:57:34PM -0800, Junio C Hamano wrote:\n\n> I agree with you that both are valid spellings, but when I\n> received 9e5d87d49070fe0463040e826824d6ce41beb089, I consulted a\n> couple of dictionaries and descendant seemed to be more widely\n> used. Besides, I think the german translation update depends on\n> it ;-).\n\nDescendant is a noun, whereas descendent is an adjective. Though like\nmany such distinctions, the two forms increasingly are used\ninterchangeably.\n\n-Peff\n"},{"id":"65272","messageId":"200801132206.52023.stimming@tuhh.de","threadId":"11539","inReplyTo":"18311.64910.643392.816623@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update and fix Makefile (spelling fix)","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-01-13T21:06:51Z","receivedAt":"2008-01-13T21:06:51Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Samstag, 12. Januar 2008 00:36 schrieb Paul Mackerras:\n> > Christian Stimming (2):\n> > gitk: Fix typo in user message.\n>\n> I was going to ignore this one since \"descendent\" is actually a valid\n> alternate spelling, and is the one I am used to. However, I don't\n> have a strong feeling about it.\n\nIn the dictionaries I consulted before proposing this patch, \"descendant\" was \nthe *only* valid spelling. I checked http://dict.leo.org/?search=descendent , \n(on paper) Oxford Advanced Learner's Dictionary (1998 edition). Now when \nlooking up http://www.m-w.com/dictionary/descendent your original spelling is \nalso mentioned as a variant, but as the other dictionaries didn't have it, I \nassumed this should rather be changed.\n\nChristian\n"}]}