@matheusbsbs / matheus-bagliano / commits / c63fe3b2dc
Fork 0

git-gui: Avoid use of libdir in Makefile

Dmitry V. Levin pointed out that on GNU linux libdir is often used in Makefiles to mean "/usr/lib" or "/usr/lib64", a directory that is meant to hold platform-specific binary files. Using a different libdir meaning here in git-gui's Makefile breaks idomatic expressions like rpm specifile "make libdir=%_libdir". Originally I asked that the git.git Makefile undefine libdir before it calls git-gui's own Makefile but it turns out this is very hard to do, if not impossible. Renaming our libdir to gg_libdir resolves this case with a minimum amount of fuss on our part. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Sep 8, 2007 at 23:05 UTC c63fe3b2dc90120a4bdba7194f92efc2f3c342ed
1 file changed +3 -3
Makefile
+3 -3
@@ -76,8 +76,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
76 TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
77 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
78
79 -libdir ?= $(sharedir)/git-gui/lib
80 -libdir_SQ = $(subst ','\'',$(libdir))
79 +gg_libdir ?= $(sharedir)/git-gui/lib
80 +libdir_SQ = $(subst ','\'',$(gg_libdir))
81
82 exedir = $(dir $(gitexecdir))share/git-gui/lib
83 exedir_SQ = $(subst ','\'',$(exedir))
@@ -126,7 +126,7 @@ TRACK_VARS = \
126 $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
127 $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
128 $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
129 - $(subst ','\'',libdir='$(libdir_SQ)') \
129 + $(subst ','\'',gg_libdir='$(libdir_SQ)') \
130 #end TRACK_VARS
131
132 GIT-GUI-VARS: .FORCE-GIT-GUI-VARS