diff options
-rwxr-xr-x | configure.py | 20 | ||||
-rw-r--r-- | src/browse.cc | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/configure.py b/configure.py index 27516b4..2eacbfe 100755 --- a/configure.py +++ b/configure.py @@ -28,8 +28,7 @@ import string import subprocess import sys -sourcedir = os.path.dirname(os.path.realpath(__file__)) -sys.path.insert(0, os.path.join(sourcedir, 'misc')) +sys.path.insert(0, 'misc') import ninja_syntax @@ -252,11 +251,11 @@ if platform.is_msvc(): objext = '.obj' def src(filename): - return os.path.join('$sourcedir', 'src', filename) + return os.path.join('src', filename) def built(filename): return os.path.join('$builddir', filename) def doc(filename): - return os.path.join('$sourcedir', 'doc', filename) + return os.path.join('doc', filename) def cc(name, **kwargs): return n.build(built(name + objext), 'cxx', src(name + '.c'), **kwargs) def cxx(name, **kwargs): @@ -268,7 +267,6 @@ def binary(name): return exe return name -n.variable('sourcedir', sourcedir) n.variable('builddir', 'build') n.variable('cxx', CXX) if platform.is_msvc(): @@ -355,9 +353,6 @@ if platform.supports_ppoll() and not options.force_pselect: if platform.supports_ninja_browse(): cflags.append('-DNINJA_HAVE_BROWSE') -# Search for generated headers relative to build dir. -cflags.append('-I.') - def shell_escape(str): """Escape str such that it's interpreted as a single argument by the shell.""" @@ -420,10 +415,10 @@ objs = [] if platform.supports_ninja_browse(): n.comment('browse_py.h is used to inline browse.py.') n.rule('inline', - command=src('inline.sh') + ' $varname < $in > $out', + command='src/inline.sh $varname < $in > $out', description='INLINE $out') n.build(built('browse_py.h'), 'inline', src('browse.py'), - implicit=src('inline.sh'), + implicit='src/inline.sh', variables=[('varname', 'kBrowsePy')]) n.newline() @@ -596,12 +591,11 @@ n.newline() if not host.is_mingw(): n.comment('Regenerate build files if build script changes.') n.rule('configure', - command='${configure_env}%s $sourcedir/configure.py $configure_args' % + command='${configure_env}%s configure.py $configure_args' % options.with_python, generator=True) n.build('build.ninja', 'configure', - implicit=['$sourcedir/configure.py', - os.path.normpath('$sourcedir/misc/ninja_syntax.py')]) + implicit=['configure.py', os.path.normpath('misc/ninja_syntax.py')]) n.newline() n.default(ninja) diff --git a/src/browse.cc b/src/browse.cc index 8673919..83bfe43 100644 --- a/src/browse.cc +++ b/src/browse.cc @@ -18,7 +18,7 @@ #include <stdlib.h> #include <unistd.h> -#include "build/browse_py.h" +#include "../build/browse_py.h" void RunBrowsePython(State* state, const char* ninja_command, const char* initial_target) { |