summaryrefslogtreecommitdiff
path: root/setup.lua
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2017-10-20 21:52:13 -0700
committerMichael Forney <mforney@mforney.org>2017-10-20 21:52:13 -0700
commit6026883449f412761b4cf066585c2ec1d1f28f6f (patch)
treec52769fdb5dd092b4b04cd355fe9315290f108fb /setup.lua
parent677b59c07c7bf2306a9cb387a402cb0feec3ced2 (diff)
Remove need for build.ninja and config.ninja
Diffstat (limited to 'setup.lua')
-rwxr-xr-xsetup.lua9
1 files changed, 4 insertions, 5 deletions
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})