From a57019296b4aecdcb79353f3e6626e844fc7a6c6 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 5 May 2018 20:35:12 +0530
Subject: [PATCH] gst-uninstalled.py: Look for both 'build' and '_build' for
builddir
---
gst-uninstalled.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gst-uninstalled.py b/gst-uninstalled.py
index a702290889..56e84898aa 100755
--- a/gst-uninstalled.py
+++ b/gst-uninstalled.py
@@ -17,6 +17,10 @@ from common import get_meson
SCRIPTDIR = os.path.dirname(os.path.realpath(__file__))
PREFIX_DIR = os.path.join(SCRIPTDIR, 'prefix')
+# Use '_build' as the builddir instead of 'build'
+DEFAULT_BUILDDIR = os.path.join(SCRIPTDIR, 'build')
+if not os.path.exists(DEFAULT_BUILDDIR):
+ DEFAULT_BUILDDIR = os.path.join(SCRIPTDIR, '_build')
def prepend_env_var(env, var, value):
@@ -203,7 +207,7 @@ if __name__ == "__main__":
parser = argparse.ArgumentParser(prog="gstreamer-uninstalled")
parser.add_argument("--builddir",
- default=os.path.join(SCRIPTDIR, "build"),
+ default=DEFAULT_BUILDDIR,
help="The meson build directory")
parser.add_argument("--srcdir",
default=SCRIPTDIR,