diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-01 18:25:06 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-01 18:25:06 +0300 |
| commit | 538854479e27f82f89a084c8446f53413e98cea6 (patch) | |
| tree | 0135b04216c9ae03ca5d6a324b49f66de91c4857 | |
| parent | 1d7201dd3547dadebc6c18845d7b333ce0b6ba1d (diff) | |
| parent | cab1c3f2bffcd599b0089681420d282b1c1baa87 (diff) | |
| download | meson-538854479e27f82f89a084c8446f53413e98cea6.tar.gz | |
Merge pull request #525 from minijackson/master
Use module path for getting scripts dir
| -rw-r--r-- | mesonbuild/environment.py | 3 | ||||
| -rw-r--r-- | mesonbuild/scripts/delwithsuffix.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index c4591b4e5..a0f410afe 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -131,7 +131,8 @@ class Environment(): coredata.save(self.coredata, cdf) def get_script_dir(self): - return os.path.join(os.path.dirname(self.meson_script_file), '../scripts') + import mesonbuild.scripts + return os.path.dirname(mesonbuild.scripts.__file__) def get_log_dir(self): return self.log_dir diff --git a/mesonbuild/scripts/delwithsuffix.py b/mesonbuild/scripts/delwithsuffix.py index 38ab406fc..e11210116 100644 --- a/mesonbuild/scripts/delwithsuffix.py +++ b/mesonbuild/scripts/delwithsuffix.py @@ -17,7 +17,7 @@ import os, sys def run(args): - if len(sys.argv) != 2: + if len(sys.argv) != 3: print('delwithsuffix.py <root of subdir to process> <suffix to delete>') sys.exit(1) |