{"thread":{"id":"6788","subject":"[PATCH] Link git-gui into the master Makefile.","startedAt":"2007-02-12T23:20:34Z","lastAt":"2007-02-12T23:20:34Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"34334","messageId":"20070212232034.GA31152@spearce.org","threadId":"6788","inReplyTo":null,"subject":"[PATCH] Link git-gui into the master Makefile.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-12T23:20:34Z","receivedAt":"2007-02-12T23:20:34Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"I'm exporting gitexecdir because git-gui wants to know where\nit should install git-gui and git-citool.  These belong under\ngitexecdir, just like git-diff, as the git wrapper is able to\ninvoke these commands for the end-user.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n This change assumes gitgui-0.6.0 or later is merged.  I would\n suggest merging it first, then applying this patch.\n\n Makefile |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 5d31e6d..40bdcff 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -602,7 +602,7 @@ LIB_OBJS += $(COMPAT_OBJS)\n ALL_CFLAGS += $(BASIC_CFLAGS)\n ALL_LDFLAGS += $(BASIC_LDFLAGS)\n \n-export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir\n+export prefix gitexecdir TAR INSTALL DESTDIR SHELL_PATH template_dir\n \n \n ### Build rules\n@@ -613,6 +613,7 @@ ifneq (,$X)\n endif\n \n all::\n+\t$(MAKE) -C git-gui all\n \t$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all\n \t$(MAKE) -C templates\n \n@@ -843,6 +844,7 @@ install: all\n \t$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n \t$(MAKE) -C perl prefix='$(prefix_SQ)' install\n+\t$(MAKE) -C git-gui install\n \tif test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \\\n \tthen \\\n \t\tln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \\\n@@ -876,8 +878,11 @@ dist: git.spec git-archive\n \t@mkdir -p $(GIT_TARNAME)\n \t@cp git.spec $(GIT_TARNAME)\n \t@echo $(GIT_VERSION) > $(GIT_TARNAME)/version\n+\t@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version\n \t$(TAR) rf $(GIT_TARNAME).tar \\\n-\t\t$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version\n+\t\t$(GIT_TARNAME)/git.spec \\\n+\t\t$(GIT_TARNAME)/version \\\n+\t\t$(GIT_TARNAME)/git-gui/version\n \t@rm -rf $(GIT_TARNAME)\n \tgzip -f -9 $(GIT_TARNAME).tar\n \n@@ -918,6 +923,7 @@ clean:\n \trm -f gitweb/gitweb.cgi\n \t$(MAKE) -C Documentation/ clean\n \t$(MAKE) -C perl clean\n+\t$(MAKE) -C git-gui clean\n \t$(MAKE) -C templates/ clean\n \t$(MAKE) -C t/ clean\n \trm -f GIT-VERSION-FILE GIT-CFLAGS\n-- \n1.5.0.rc4.26.gcc46a\n"}]}