]> granicus.if.org Git - cgit/commitdiff
Makefile: re-include cgit.conf in cgit.mk
authorJohn Keeping <john@keeping.me.uk>
Mon, 1 Apr 2013 13:14:12 +0000 (14:14 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 8 Apr 2013 13:43:17 +0000 (15:43 +0200)
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@keeping.me.uk>
cgit.mk

diff --git a/cgit.mk b/cgit.mk
index e1aed63a3adc9070fe61b5a514053dcbca541167..bf3bbb1c71b5c4a822df6f8e74c566707aec6263 100644 (file)
--- 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.