summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-13 19:41:31 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-14 02:14:14 (GMT)
commit86215812487930c69e197ef03be31e0b396a04cc (patch)
tree7e2b7e225b74cc0c06c2aa587798c756eb3a644d
parent82dd4e0465282e39962ba8fdb01c42aa665b1999 (diff)
downloadgit-86215812487930c69e197ef03be31e0b396a04cc.zip
git-86215812487930c69e197ef03be31e0b396a04cc.tar.gz
git-86215812487930c69e197ef03be31e0b396a04cc.tar.bz2
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>
-rw-r--r--.gitignore1
-rw-r--r--Makefile2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a7cfd6d..6483b21 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 ef9cd91..e860319 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))