From 4a1e2cd1ce5ce44fdf4461e0ea51f4f362b23256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 17 Aug 2015 16:06:16 +0200
Subject: Set configuration back do default and add overlap

Configuration is set back as it was before previous merge on branch
master.

Configurations for targets can be specified by overlapping
configuration options with external config.
---
 conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf.py')

diff --git a/conf.py b/conf.py
index f8742d6..c2f1902 100644
--- a/conf.py
+++ b/conf.py
@@ -132,7 +132,7 @@ if os.path.isfile('.target'):
 	target = None
 	with open('.target', 'r') as f:
 		target = f.readline().rstrip()
-	conffile = os.path.join('targets', target + '.py')
+	conffile = os.path.join('targets', target, 'conf.py')
 	if os.path.isfile(conffile):
 		ovconf = importlib.machinery.SourceFileLoader("module.name", conffile).load_module()
 		for name in dir(ovconf):
-- 
cgit v1.2.3