From 86215812487930c69e197ef03be31e0b396a04cc Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 13 Oct 2007 15:41:31 -0400 Subject: [PATCH] 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 --- .gitignore | 1 + Makefile | 2 ++ 2 files changed, 3 insertions(+) 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)) -- 2.30.2