summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-21 21:07:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-21 21:07:35 +0100
commit237a0052c60af768f4d62b00321932918b7ba4d9 (patch)
tree77f916d925fd68c7f5f01ba400c2f0f2c3646437 /cscript
parent03fe8bf1bfb96a775a8e40529b50e9f69b311fc3 (diff)
parentb650eba5103a5b924774d3db947cb704ea9d1879 (diff)
Merge master.
Diffstat (limited to 'cscript')
-rw-r--r--cscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/cscript b/cscript
index b54b7da31..17f267628 100644
--- a/cscript
+++ b/cscript
@@ -29,7 +29,7 @@ def package(env, target, version):
if target.platform == 'windows':
shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits)
env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
- env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits))
+ env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits))
env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits)
env.command('makensis build/windows/installer2.%s.nsi' % target.bits)