From 8e959b7894047030edca21a04dd91994e8868a1f Mon Sep 17 00:00:00 2001
From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
Date: Fri, 25 Feb 2022 06:05:43 +0530
Subject: [PATCH 2/2] Revert "wp-uninstalled: build this script with the meson
 dirs filled in"

This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
Upstream-Status: Inappropriate[meson version dependent]
---
 meson.build       | 31 -------------------------------
 wp-uninstalled.sh | 11 ++---------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/meson.build b/meson.build
index e4323dc..185248f 100644
--- a/meson.build
+++ b/meson.build
@@ -120,34 +120,3 @@ subdir('src')
 if get_option('tests')
   subdir('tests')
 endif
-
-conf_uninstalled = configuration_data()
-conf_uninstalled.set('MESON', '')
-conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
-conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
-
-wp_uninstalled = configure_file(
-  input : 'wp-uninstalled.sh',
-  output : 'wp-uninstalled.sh.in',
-  configuration : conf_uninstalled,
-)
-
-wireplumber_uninstalled = custom_target('wp-uninstalled',
-  output : 'wp-uninstalled.sh',
-  input : wp_uninstalled,
-  build_by_default : true,
-  command : ['cp', '@INPUT@', '@OUTPUT@'],
-)
-
-if meson.version().version_compare('>= 0.58')
-  builddir = meson.project_build_root()
-  srcdir = meson.project_source_root()
-
-  devenv = environment({
-    'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
-    'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
-    'WIREPLUMBER_DATA_DIR': srcdir / 'src',
-  })
-
-  meson.add_devenv(devenv)
-endif
diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
index 79e53f2..d6279ff 100755
--- a/wp-uninstalled.sh
+++ b/wp-uninstalled.sh
@@ -2,15 +2,8 @@
 
 set -e
 
-# This is unset by meson
-# shellcheck disable=SC2157
-if [ -z "@MESON@" ]; then
-  SOURCEDIR="@MESON_SOURCE_ROOT@"
-  BUILDDIR="@MESON_BUILD_ROOT@"
-else
-  SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-  BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
-fi
+SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+BUILDDIR=${SOURCEDIR}/build
 CONFIGDIR=config
 
 while getopts ":b:c:" opt; do
-- 
2.35.1