David Turner <dturner@xxxxxxxxxxxxxxxx> writes:
> Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
> where to look for TCL libs. This allows a git-gui which has been
> built with a prefix of /foo to be run out of directory /bar. This is
> the equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL
> libraries.
>
> Signed-off-by: David Turner <dturner@xxxxxxxxxxx>
> ---
> git-gui/Makefile | 3 ++-
> git-gui/git-gui.sh | 6 +++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
Would a similar change to gitk necessary/beneficial to platforms
that would benefit from this change?
git-gui directory in my tree comes from its upstream repository
git://repo.or.cz/git-gui.git/, and it is maintained by Pat Thoyts
(Cc'ed).
gitk is from git://ozlabs.org/~paulus/gitk.git maintained by Paul
Mackerras <paulus@xxxxxxxxx> (not Cc'ed).
Note that these two upstream projects do not have leading
directories git-gui and gitk-git themselves (they are merged to my
tree while their paths being renamed). A patch that is appliable to
them would touch paths without them (e.g. Makefile and git-gui.sh
for an equivalent of the patch I am responding to).
Thanks.
> diff --git a/git-gui/Makefile b/git-gui/Makefile
> index cde8b2e..56bf9e2 100644
> --- a/git-gui/Makefile
> +++ b/git-gui/Makefile
> @@ -177,7 +177,8 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS
> echo then >>$@+ && \
> echo ' 'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
> echo else >>$@+ && \
> - echo ' 'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\' \
> + echo ' libdir="$$(GIT_GUI_LIB_DIR:-$(libdir_SQ))"' >>$@+ && \
> + echo ' 'exec \"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\" \
> '"$$0" "$$@"' >>$@+ && \
> echo fi >>$@+ && \
> chmod +x $@+ && \
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index b186329..6cbb36e 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -49,7 +49,11 @@ catch {rename send {}} ; # What an evil concept...
> ##
> ## locate our library
>
> -set oguilib {@@GITGUI_LIBDIR@@}
> +if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
> + set oguilib $::env(GIT_GUI_LIB_DIR)
> +} else {
> + set oguilib {@@GITGUI_LIBDIR@@}
> +}
> set oguirel {@@GITGUI_RELATIVE@@}
> if {$oguirel eq {1}} {
> set oguilib [file dirname [file normalize $argv0]]
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html