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 a7cfd6d5a016b9c0089fcd3409c25cfce5986271..6483b21cbfc73601602d628a2c609d3ca84f9e53 100644 (file)
--- 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 ef9cd9126256b0ecafbc2d6e61447da42b1e897a..e8603192788fb0d8c83ff5ad33eb947cd77252b4 100644 (file)
--- 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))