diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-12 16:07:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 16:07:29 -0800 |
| commit | 67c7575947b06a2a9bbdb355357895149bdbd8e5 (patch) | |
| tree | 8d1a2ad10b83002967b8762b0fef79a32bf2444d /git-gui/Makefile | |
| parent | d63ea115948a892f94451677c322c5a6f233adc6 (diff) | |
| parent | fdf6cfc4266d1e88e74c09e9166fa0b5c9ad29cb (diff) | |
| download | git-67c7575947b06a2a9bbdb355357895149bdbd8e5.tar.gz git-67c7575947b06a2a9bbdb355357895149bdbd8e5.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Change base version to 0.6.
git-gui: Guess our version accurately as a subproject.
git-gui: Handle gitgui tags in version gen.
git-gui: Generate a version file on demand.
git-gui: Rename GIT_VERSION to GITGUI_VERSION.
git-gui: Allow gitexecdir, INSTALL to be set by the caller.
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 8fade6912..fd82d9d16 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -12,18 +12,22 @@ ifndef SHELL_PATH SHELL_PATH = /bin/sh endif -gitexecdir := $(shell git --exec-path) -INSTALL = install +ifndef gitexecdir + gitexecdir := $(shell git --exec-path) +endif + +ifndef INSTALL + INSTALL = install +endif DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) - SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh rm -f $@ $@+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ $@.sh >$@+ chmod +x $@+ mv $@+ $@ @@ -31,7 +35,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(GITGUI_BUILT_INS): git-gui rm -f $@ && ln git-gui $@ -# These can record GIT_VERSION +# These can record GITGUI_VERSION $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE all:: $(ALL_PROGRAMS) @@ -41,8 +45,12 @@ install: all $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) +dist-version: + @mkdir -p $(TARDIR) + @echo $(GITGUI_VERSION) > $(TARDIR)/version + clean:: rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE -.PHONY: all install clean +.PHONY: all install dist-version clean .PHONY: .FORCE-GIT-VERSION-FILE |