Merge pull request #2163 from chetgurevitch/master

Don't error if build directory is already configured and update instructions

1 files changed, 5 insertions, 4 deletions

diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 9efe4e3..ab14b15 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -113,13 +113,14 @@ class MesonApp:
         priv_dir = os.path.join(build_dir, 'meson-private/coredata.dat')
         if os.path.exists(priv_dir):
             if not handshake:
-                msg = '''Trying to run Meson on a build directory that has already been configured.
+                print('''Trying to run Meson on a build directory that has already been configured.
 If you want to build it, just run your build command (e.g. ninja) inside the
 build directory. Meson will autodetect any changes in your setup and regenerate
-itself as required.
+itself as required. Though it shouldn't be necessary, running ninja reconfigure
+will force Meson to regenerate the build files.
 
-If you want to change option values, use the mesonconf tool instead.'''
-                raise RuntimeError(msg)
+If you want to change option values, use meson configure instead.''')
+                sys.exit(0)
         else:
             if handshake:
                 raise RuntimeError('Something went terribly wrong. Please file a bug.')