From 6026883449f412761b4cf066585c2ec1d1f28f6f Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 20 Oct 2017 21:52:13 -0700
Subject: Remove need for build.ninja and config.ninja

---
 setup.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'setup.lua')

diff --git a/setup.lua b/setup.lua
index 66cbd168..96abb05c 100755
--- a/setup.lua
+++ b/setup.lua
@@ -3,9 +3,6 @@
 if not os.execute('test -f config.lua') then
 	os.execute('cp config.def.lua config.lua')
 end
-if not os.execute('test -f config.ninja') then
-	os.execute('cp config.def.ninja config.ninja')
-end
 
 dofile 'ninja.lua'
 config = dofile 'config.lua'
@@ -51,8 +48,10 @@ function gen(dir)
 	}
 	io.output(dir..'/local.ninja.tmp')
 	set('dir', dir)
-	set('outdir', '$builddir/$dir')
-	set('srcdir', '$dir/src')
+	if dir ~= '.' then
+		set('outdir', '$builddir/$dir')
+		set('srcdir', '$dir/src')
+	end
 	dofile(dir..'/gen.lua')
 
 	build('gen', '$dir/local.ninja', {'|', pkg.inputs.gen})
-- 
cgit v1.2.3