From: Jakub Narebski <redacted>
Date: Sun, 26 Sep 2010 13:02:24 +0000 (+0200)
Subject: gitweb/Makefile: Include gitweb/config.mak
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/03a7f59847ec4048581aa7035ecd0355baeac8d9796b1fa4fc2ee99517398576

gitweb/Makefile: Include gitweb/config.mak

Allow for gitweb-specific Makefile config to reside in config.mak file
in the 'gitweb/' subdirectory.  This means that gitweb-specific
build-time configuration variable can reside in gitweb-specific
gitweb/config.mak

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/Makefile b/Makefile
index 3eb5f55..4a08f42 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ HIGHLIGHT_BIN = highlight
 # include user config
 -include ../config.mak.autogen
 -include ../config.mak
+-include config.mak
 
 # determine version
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE