Merge branch 'master' of git://github.com/ehird/ninja

diff --cc HACKING
Simple merge

diff --cc configure.py
index 6111588,4c49f40..2e044c1
--- 1/configure.py
--- 2/configure.py
+++ b/configure.py
@@@ -41,7 -38,10 +41,10 @@@ parser.add_option('--profile', metavar=
                    choices=profilers,
                    help='enable profiling (' + '/'.join(profilers) + ')',)
  parser.add_option('--with-gtest', metavar='PATH',
 -                  help='use gtest built in directory PATH')
 +                  help='use gtest unpacked in directory PATH')
+ parser.add_option('--with-python', metavar='EXE',
+                   help='use EXE as the Python interpreter',
+                   default=os.path.basename(sys.executable))
  (options, args) = parser.parse_args()
  
  platform = options.platform
@@@ -268,10 -251,10 +272,10 @@@ n.build('doxygen', 'doxygen', doc('doxy
          implicit=mainpage)
  n.newline()
  
 -if platform != 'mingw':
 +if host != 'mingw':
      n.comment('Regenerate build files if build script changes.')
      n.rule('configure',
-            command='./configure.py $configure_args',
+            command=options.with_python + ' configure.py $configure_args',
             generator=True)
      n.build('build.ninja', 'configure',
              implicit=['configure.py', 'misc/ninja_syntax.py'])