"Dmitry V. Levin" <ldv@xxxxxxxxxxxx> wrote: > On Fri, Sep 07, 2007 at 01:01:48AM -0400, Shawn O. Pearce wrote: > > "Dmitry V. Levin" <ldv@xxxxxxxxxxxx> wrote: > > > > "Dmitry V. Levin" <ldv@xxxxxxxxxxxx> wrote: > > > > > On GNU/Linux, libdir is used to mean "/usr/lib or /usr/lib64" > > > > > depending on architecture. Different libdir meaning breaks > > > > > idiomatic expressions like rpm specfile "make libdir=%_libdir". > > > > Call it datadir then? I see you point, and now agree with you. > > I'm not sure that "datadir" is better choice than current "libdir". > First, from git-gui point of view, files placed in git-gui/lib/ are > rather library files than data files. > Second, if top-level makefile will define "datadir", original issue will > raise again. > That's why I suggested to add some git-gui specific component to git-gui's > libdir variable name. What about this instead? I think it gets the same goal but does so with the smallest amount of change... diff --git a/Makefile b/Makefile index 1bac6fe..f11cf26 100644 --- a/Makefile +++ b/Makefile @@ -76,8 +76,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) -libdir ?= $(sharedir)/git-gui/lib -libdir_SQ = $(subst ','\'',$(libdir)) +gg_libdir ?= $(sharedir)/git-gui/lib +libdir_SQ = $(subst ','\'',$(gg_libdir)) exedir = $(dir $(gitexecdir))share/git-gui/lib exedir_SQ = $(subst ','\'',$(exedir)) @@ -126,7 +126,7 @@ TRACK_VARS = \ $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \ $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \ $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \ - $(subst ','\'',libdir='$(libdir_SQ)') \ + $(subst ','\'',gg_libdir='$(libdir_SQ)') \ #end TRACK_VARS GIT-GUI-VARS: .FORCE-GIT-GUI-VARS -- Shawn. - 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
