Fix merge.

diff --cc cscript
index 87e7551e46a826bd298c16511472779128dc5423,4ba4eadb918b6c9ab512c98e9a9583b4a78cd8ca..1f43f8936db78b6ca3c70593f1801e388e39fd60
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -14,9 -14,7 +14,9 @@@ def build(env, target)
      cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
      if target.platform == 'windows':
          cmd += ' --target-windows'
-     else if target.platform == 'osx':
++    elif target.platform == 'osx':
 +      cmd += ' --osx'
-     else if target.platform == 'linux':
+     elif target.platform == 'linux':
          cmd += ' --static'
      env.command(cmd)