summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Keeping2013-04-01 14:14:12 +0100
committerJason A. Donenfeld2013-04-08 15:43:17 +0200
commitcfb77e97fa63d709c81bc730ea47a06172d78669 (patch)
tree11bd4dc5487da2dac6f764ad09b7358d1f1ad76f
parenta92678b5f119811bccaca9c31b779c5ceed95572 (diff)
downloadcgit-cfb77e97fa63d709c81bc730ea47a06172d78669.tar.gz
Makefile: re-include cgit.conf in cgit.mk
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>
Diffstat (limited to '')
-rw-r--r--cgit.mk2
1 files changed, 2 insertions, 0 deletions
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.