diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-12 20:00:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:00:34 +0200 |
| commit | a32f31fdfaa2cfd3d6578742fba43bfa66049bf1 (patch) | |
| tree | b2519269fab446e06278b7b5276428ac8c949e68 /mesonbuild/mintro.py | |
| parent | 627d0d1f3e0ece4a8d4dae1f66cc44b40439b171 (diff) | |
| parent | 71d174bcbe7ef6d319ee0afd1794073354e1bd35 (diff) | |
| download | meson-a32f31fdfaa2cfd3d6578742fba43bfa66049bf1.zip meson-a32f31fdfaa2cfd3d6578742fba43bfa66049bf1.tar.gz meson-a32f31fdfaa2cfd3d6578742fba43bfa66049bf1.tar.bz2 | |
Merge pull request #4826 from mensinda/confDefOpts
mconf: Use introspection to print the project default options (fixes #2543)
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 5eecb67..2d01c11 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -321,7 +321,7 @@ def run(options): if options.builddir is not None: datadir = os.path.join(options.builddir, datadir) infodir = os.path.join(options.builddir, infodir) - if options.builddir.endswith('/meson.build') or options.builddir.endswith('\\meson.build') or options.builddir == 'meson.build': + if 'meson.build' in [os.path.basename(options.builddir), options.builddir]: sourcedir = '.' if options.builddir == 'meson.build' else options.builddir[:-11] if options.projectinfo: list_projinfo_from_source(sourcedir, indent) |