[PATCH 1/2] Makefile: re-include cgit.conf in cgit.mk

[John Keeping]

This avoids needed to export every variable that might be used in
cgit.mk from the top-level Makefile.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 cgit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cgit.mk b/cgit.mk
index e1aed63..bf3bbb1 100644
--- a/cgit.mk
+++ b/cgit.mk
@@ -5,6 +5,8 @@ include Makefile
 
 CGIT_PREFIX = ../
 
+-include $(CGIT_PREFIX)cgit.conf
+
 # The CGIT_* variables are inherited when this file is called from the
 # main Makefile - they are defined there.
 
-- 
1.8.2.540.gf023cfe