summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-21 12:51:43 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-21 12:51:43 +0100
commitdc6713f19bb9084aac18eabe399b14ca1ac26df9 (patch)
tree8c6591d7dbc10c54c672869dd4ec8bb64aeb8c39 /cscript
parent83742c7e6edcf958e0820abc77c029f4ada4880f (diff)
parent47e6b6725168213f2a7db24c2965cfa173f755b4 (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 04161eef3..4c54b0377 100644
--- a/cscript
+++ b/cscript
@@ -28,7 +28,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)