Merge pull request ninja-build#288 from nico/buildfix

ninja_syntax.build() returns a list, not a single string.
okuoku · May 1, 2012 · 4d1674f · 4d1674f
2 parents a404807 + 53c55b0
commit 4d1674f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/configure.py b/configure.py
@@ -246,7 +246,7 @@ def binary(name):
 objs = cxx('ninja')
 ninja = n.build(binary('ninja'), 'link', objs, implicit=ninja_lib,
                 variables=[('libs', libs)])
-if ninja != 'ninja':
+if 'ninja' not in ninja:
   n.build('ninja', 'phony', ninja)
 n.newline()
 all_targets += ninja
@@ -300,7 +300,7 @@ def binary(name):
 ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib,
                      variables=[('ldflags', test_ldflags),
                                 ('libs', test_libs)])
-if ninja_test != 'ninja_test':
+if 'ninja_test' not in ninja_test:
   n.build('ninja_test', 'phony', ninja_test)
 n.newline()
 all_targets += ninja_test