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>
Shawn O. Pearce committed
Feb 12, 2007 at 18:20 UTC
d647c2ea44110630dd39757bae152029dfa62791
1 file changed
+8
-2
Makefile
+8
-2
@@ -602,7 +602,7 @@ LIB_OBJS += $(COMPAT_OBJS)
602
ALL_CFLAGS += $(BASIC_CFLAGS)
603
ALL_LDFLAGS += $(BASIC_LDFLAGS)
604
605
-export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
605
+export prefix gitexecdir TAR INSTALL DESTDIR SHELL_PATH template_dir
606
607
608
### Build rules
@@ -613,6 +613,7 @@ ifneq (,$X)
613
endif
614
615
all::
616
+ $(MAKE) -C git-gui all
617
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
618
$(MAKE) -C templates
619
@@ -843,6 +844,7 @@ install: all
844
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
845
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
846
$(MAKE) -C perl prefix='$(prefix_SQ)' install
847
+ $(MAKE) -C git-gui install
848
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
849
then \
850
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
@@ -876,8 +878,11 @@ dist: git.spec git-archive
878
@mkdir -p $(GIT_TARNAME)
879
@cp git.spec $(GIT_TARNAME)
880
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
881
+ @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
882
$(TAR) rf $(GIT_TARNAME).tar \
880
- $(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
883
+ $(GIT_TARNAME)/git.spec \
884
+ $(GIT_TARNAME)/version \
885
+ $(GIT_TARNAME)/git-gui/version
886
@rm -rf $(GIT_TARNAME)
887
gzip -f -9 $(GIT_TARNAME).tar
888
@@ -918,6 +923,7 @@ clean:
923
rm -f gitweb/gitweb.cgi
924
$(MAKE) -C Documentation/ clean
925
$(MAKE) -C perl clean
926
+ $(MAKE) -C git-gui clean
927
$(MAKE) -C templates/ clean
928
$(MAKE) -C t/ clean
929
rm -f GIT-VERSION-FILE GIT-CFLAGS