Merge pull request #1149 from centricular/compiler_check_ext_deps_only

Compiler checks can only accept external dependencies

5 files changed, 9 insertions, 9 deletions

diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py
index be2f94b..8baf323 100644
--- a/mesonbuild/scripts/gettext.py
+++ b/mesonbuild/scripts/gettext.py
@@ -16,7 +16,7 @@ import os
 import shutil
 import argparse
 import subprocess
-from mesonbuild.scripts import destdir_join
+from . import destdir_join
 
 parser = argparse.ArgumentParser()
 parser.add_argument('command')
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
index e34b541..41a4efe 100755
--- a/mesonbuild/scripts/gtkdochelper.py
+++ b/mesonbuild/scripts/gtkdochelper.py
@@ -17,8 +17,8 @@ import sys, os
 import subprocess
 import shutil
 import argparse
-from mesonbuild.mesonlib import MesonException
-from mesonbuild.scripts import destdir_join
+from ..mesonlib import MesonException
+from . import destdir_join
 
 parser = argparse.ArgumentParser()
 
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 5cf02e6..14539e0 100755
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -16,8 +16,8 @@
 
 import sys, pickle, os, shutil, subprocess, gzip, platform
 from glob import glob
-from mesonbuild.scripts import depfixer
-from mesonbuild.scripts import destdir_join
+from . import depfixer
+from . import destdir_join
 
 install_log_file = None
 
diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py
index e8e1077..5077970 100755
--- a/mesonbuild/scripts/regen_checker.py
+++ b/mesonbuild/scripts/regen_checker.py
@@ -29,7 +29,7 @@ def need_regen(regeninfo, regen_timestamp):
     # We must make sure to recreate it, even if we do not regenerate the solution.
     # Otherwise, Visual Studio will always consider the REGEN project out of date.
     print("Everything is up-to-date, regeneration of build files is not needed.")
-    from mesonbuild.backend.vs2010backend import Vs2010Backend
+    from ..backend.vs2010backend import Vs2010Backend
     Vs2010Backend.touch_regen_timestamp(regeninfo.build_dir)
     return False
 
diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py
index 524ef45..4eec425 100644
--- a/mesonbuild/scripts/yelphelper.py
+++ b/mesonbuild/scripts/yelphelper.py
@@ -16,9 +16,9 @@ import sys, os
 import subprocess
 import shutil
 import argparse
-from mesonbuild import mlog
-from mesonbuild.mesonlib import MesonException
-from mesonbuild.scripts import destdir_join
+from .. import mlog
+from ..mesonlib import MesonException
+from . import destdir_join
 
 parser = argparse.ArgumentParser()
 parser.add_argument('command')