From: Shawn O. Pearce <spearce@spearce.org>
Date: Sat, 13 Oct 2007 19:41:31 +0000 (-0400)
Subject: git-gui: Honor a config.mak in git-gui's top level
X-Git-Tag: gitgui-0.9.0~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=86215812487930c69e197ef03be31e0b396a04cc;p=git.git

git-gui: Honor a config.mak in git-gui's top level

I keep forgetting to include TCLTK_PATH when I build git-gui on some
systems.  Placing that rule (among others) into a config.mak makes it
easier to compile the application the same way every time.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/.gitignore b/.gitignore
index a7cfd6d5a..6483b21cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+config.mak
 Git Gui.app*
 git-gui.tcl
 GIT-VERSION-FILE
diff --git a/Makefile b/Makefile
index ef9cd9126..e86031927 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,8 @@ ifeq ($(findstring $(MAKEFLAGS),s),s)
 QUIET_GEN =
 endif
 
+-include config.mak
+
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))