uninstalled: use build and source root1.10

2 files changed, 12 insertions, 2 deletions

diff --git a/gst-uninstalled.py b/gst-uninstalled.py
index 37e48a2..ab99f31 100755
--- a/gst-uninstalled.py
+++ b/gst-uninstalled.py
@@ -91,6 +91,9 @@ if __name__ == "__main__":
     parser.add_argument("--builddir",
                         default=os.path.join(SCRIPTDIR, "build"),
                         help="The meson build directory")
+    parser.add_argument("--srcdir",
+                        default=SCRIPTDIR,
+                        help="The top level source directory")
     parser.add_argument("--gst-version", default="master",
                         help="The GStreamer major version")
     options, args = parser.parse_known_args()
@@ -100,6 +103,11 @@ if __name__ == "__main__":
               options.builddir)
         exit(1)
 
+    if not os.path.exists(options.srcdir):
+        print("The specified source dir does not exist" %
+              options.srcdir)
+        exit(1)
+
     if not args:
         if os.name is 'nt':
             args = [os.environ.get("COMSPEC", r"C:\WINDOWS\system32\cmd.exe")]
@@ -118,6 +126,7 @@ if __name__ == "__main__":
                 args.append(tmprc.name)
 
     try:
-        exit(subprocess.call(args, env=get_subprocess_env(options)))
+        exit(subprocess.call(args, cwd=options.srcdir,
+                             env=get_subprocess_env(options)))
     except subprocess.CalledProcessError as e:
         exit(e.returncode)
diff --git a/meson.build b/meson.build
index 50df47d..c1cb185 100644
--- a/meson.build
+++ b/meson.build
@@ -98,5 +98,6 @@ foreach subproj: subprojects
 endforeach
 
 setenv = find_program('gst-uninstalled.py')
-run_target('uninstalled', command : [setenv, '--builddir=@0@'.format(meson.current_build_dir()),
+run_target('uninstalled', command : [setenv, '--builddir=@0@'.format(meson.build_root()),
+	   '--srcdir=@0@'.format(meson.source_root()),
            '--gst-version=@0@'.format(gst_branch)])