diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-12 22:12:04 +0100 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-02-12 22:12:04 +0100 |
| commit | 7e81d4eead48c189d52406379150b09fd4096987 (patch) | |
| tree | 6f566b70c7960b39513f8ec159847d642bf8cc54 | |
| parent | git-gui: Allow gitexecdir, INSTALL to be set by the caller. (diff) | |
| download | git-7e81d4eead48c189d52406379150b09fd4096987.tar.xz git-7e81d4eead48c189d52406379150b09fd4096987.zip | |
git-gui: Rename GIT_VERSION to GITGUI_VERSION.
Now that the decision has been made to treat git-gui as a
subproject, rather than merging it directly into git, we
should use a different substitution for our version value
to avoid any possible confusion.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | GIT-VERSION-GEN | 6 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | git-gui.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 79f1c527ff..79558f39cf 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -34,13 +34,13 @@ esac if test -r $GVF then - VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) + VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) else VC=unset fi test "$VN" = "$VC" || { - echo >&2 "GIT_VERSION = $VN" - echo "GIT_VERSION = $VN" >$GVF + echo >&2 "GITGUI_VERSION = $VN" + echo "GITGUI_VERSION = $VN" >$GVF } @@ -27,7 +27,7 @@ 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 $@+ $@ @@ -35,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) diff --git a/git-gui.sh b/git-gui.sh index ea16be43ac..f5010dd47a 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2,7 +2,7 @@ # Tcl ignores the next line -*- tcl -*- \ exec wish "$0" -- "$@" -set appvers {@@GIT_VERSION@@} +set appvers {@@GITGUI_VERSION@@} set copyright { Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras. |