diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-12 18:20:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 16:18:12 -0800 |
| commit | d647c2ea44110630dd39757bae152029dfa62791 (patch) | |
| tree | 1628c5f1933d3408b116a79c961d36c5ef18d921 /Makefile | |
| parent | 67c7575947b06a2a9bbdb355357895149bdbd8e5 (diff) | |
| download | git-d647c2ea44110630dd39757bae152029dfa62791.tar.gz git-d647c2ea44110630dd39757bae152029dfa62791.tar.xz | |
Link git-gui into the master Makefile.
I'm exporting gitexecdir because git-gui wants to know where
it should install git-gui and git-citool. These belong under
gitexecdir, just like git-diff, as the git wrapper is able to
invoke these commands for the end-user.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -602,7 +602,7 @@ LIB_OBJS += $(COMPAT_OBJS) ALL_CFLAGS += $(BASIC_CFLAGS) ALL_LDFLAGS += $(BASIC_LDFLAGS) -export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir +export prefix gitexecdir TAR INSTALL DESTDIR SHELL_PATH template_dir ### Build rules @@ -613,6 +613,7 @@ ifneq (,$X) endif all:: + $(MAKE) -C git-gui all $(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all $(MAKE) -C templates @@ -843,6 +844,7 @@ install: all $(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install $(MAKE) -C perl prefix='$(prefix_SQ)' install + $(MAKE) -C git-gui install if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ then \ ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ @@ -876,8 +878,11 @@ dist: git.spec git-archive @mkdir -p $(GIT_TARNAME) @cp git.spec $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version + @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version $(TAR) rf $(GIT_TARNAME).tar \ - $(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version + $(GIT_TARNAME)/git.spec \ + $(GIT_TARNAME)/version \ + $(GIT_TARNAME)/git-gui/version @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar @@ -918,6 +923,7 @@ clean: rm -f gitweb/gitweb.cgi $(MAKE) -C Documentation/ clean $(MAKE) -C perl clean + $(MAKE) -C git-gui clean $(MAKE) -C templates/ clean $(MAKE) -C t/ clean rm -f GIT-VERSION-FILE GIT-CFLAGS |