summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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))