diff options
| author | Araq <rumpf_a@web.de> | 2014-10-13 08:26:24 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-10-13 08:26:24 +0200 |
| commit | c7570dcd3e4202bd339a2ebbc09952a546c62269 (patch) | |
| tree | 1e3b7a73a597bc825b03bce6ebac4db9a3d7d237 /tools/niminst | |
| parent | 5272213da4b0701890d8a42fb292962704f0b99d (diff) | |
| parent | b7befd69ba0051c1db44a37c8c3e06c48990a9b1 (diff) | |
| download | Nim-c7570dcd3e4202bd339a2ebbc09952a546c62269.tar.gz | |
Merge branch 'devel' into bigbreak
Conflicts: compiler/ast.nim compiler/nimfix/prettybase.nim compiler/pragmas.nim compiler/sempass2.nim doc/manual.txt koch.nim lib/pure/concurrency/threadpool.nim web/news.txt
Diffstat (limited to 'tools/niminst')
| -rw-r--r-- | tools/niminst/niminst.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index 686a0bfa3..614009c24 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -503,9 +503,9 @@ when haveZipLib: else: n = c.outdir / n var z: TZipArchive if open(z, n, fmWrite): - addFile(z, proj / buildBatFile32, buildBatFile32) - addFile(z, proj / buildBatFile64, buildBatFile64) - addFile(z, proj / buildShFile, buildShFile) + addFile(z, proj / buildBatFile32, "build" / buildBatFile32) + addFile(z, proj / buildBatFile64, "build" / buildBatFile64) + addFile(z, proj / buildShFile, "build" / buildShFile) addFile(z, proj / installShFile, installShFile) addFile(z, proj / deinstallShFile, deinstallShFile) for f in walkFiles(c.libpath / "lib/*.h"): @@ -513,7 +513,7 @@ when haveZipLib: for osA in 1..c.oses.len: for cpuA in 1..c.cpus.len: var dir = buildDir(osA, cpuA) - for k, f in walkDir(dir): + for k, f in walkDir("build" / dir): if k == pcFile: addFile(z, proj / dir / extractFilename(f), f) for cat in items({fcConfig..fcOther, fcUnix}): |