зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
67c7575947
Коммит
d647c2ea44
10
Makefile
10
Makefile
|
@ -602,7 +602,7 @@ LIB_OBJS += $(COMPAT_OBJS)
|
||||||
ALL_CFLAGS += $(BASIC_CFLAGS)
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
||||||
ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
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
|
### Build rules
|
||||||
|
@ -613,6 +613,7 @@ ifneq (,$X)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all::
|
all::
|
||||||
|
$(MAKE) -C git-gui all
|
||||||
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
|
$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
|
||||||
$(MAKE) -C templates
|
$(MAKE) -C templates
|
||||||
|
|
||||||
|
@ -843,6 +844,7 @@ install: all
|
||||||
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
|
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
|
||||||
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
||||||
$(MAKE) -C perl prefix='$(prefix_SQ)' install
|
$(MAKE) -C perl prefix='$(prefix_SQ)' install
|
||||||
|
$(MAKE) -C git-gui install
|
||||||
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
|
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
|
||||||
then \
|
then \
|
||||||
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
||||||
|
@ -876,8 +878,11 @@ dist: git.spec git-archive
|
||||||
@mkdir -p $(GIT_TARNAME)
|
@mkdir -p $(GIT_TARNAME)
|
||||||
@cp git.spec $(GIT_TARNAME)
|
@cp git.spec $(GIT_TARNAME)
|
||||||
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
||||||
|
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
|
||||||
$(TAR) rf $(GIT_TARNAME).tar \
|
$(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)
|
@rm -rf $(GIT_TARNAME)
|
||||||
gzip -f -9 $(GIT_TARNAME).tar
|
gzip -f -9 $(GIT_TARNAME).tar
|
||||||
|
|
||||||
|
@ -918,6 +923,7 @@ clean:
|
||||||
rm -f gitweb/gitweb.cgi
|
rm -f gitweb/gitweb.cgi
|
||||||
$(MAKE) -C Documentation/ clean
|
$(MAKE) -C Documentation/ clean
|
||||||
$(MAKE) -C perl clean
|
$(MAKE) -C perl clean
|
||||||
|
$(MAKE) -C git-gui clean
|
||||||
$(MAKE) -C templates/ clean
|
$(MAKE) -C templates/ clean
|
||||||
$(MAKE) -C t/ clean
|
$(MAKE) -C t/ clean
|
||||||
rm -f GIT-VERSION-FILE GIT-CFLAGS
|
rm -f GIT-VERSION-FILE GIT-CFLAGS
|
||||||
|
|
Загрузка…
Ссылка в новой задаче