From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 26 Sep 2010 13:02:24 +0000 (+0200)
Subject: gitweb/Makefile: Include gitweb/config.mak
X-Git-Tag: v1.7.4-rc0~145^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b93aeb29cea16880926bc150ac31cfb31475a44;p=git.git

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 <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/gitweb/Makefile b/gitweb/Makefile
index f2180741f..df908a18e 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -39,6 +39,7 @@ GITWEB_SITE_FOOTER =
 # include user config
 -include ../config.mak.autogen
 -include ../config.mak
+-include config.mak
 
 # determine version
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE