From 73c70847ad5b60b1d9f455d8d6f4465e50ff5290 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Fri, 24 Mar 2017 17:00:23 -0400 Subject: [PATCH] meson: Reuse plugins_install_dir for building env --- tests/check/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build index ff512abfca..e672b5a6ec 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -128,8 +128,7 @@ foreach t : base_tests env = environment() env.set('GST_PLUGIN_PATH_1_0', - meson.build_root(), - '@0@/@1@/gstreamer-1.0'.format(get_option('prefix'), get_option('libdir')), + meson.build_root(), '@0@/@1@'.format(get_option('prefix'), plugins_install_dir), seperator: ':') env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink') @@ -153,8 +152,7 @@ foreach group : [1, 2, 3, 4, 5, 6] # TODO Use env.copy when it is in meson env = environment() env.set('GST_PLUGIN_PATH_1_0', - meson.build_root(), - '@0@/@1@/gstreamer-1.0'.format(get_option('prefix'), get_option('libdir')), + meson.build_root(), '@0@/@1@'.format(get_option('prefix'), plugins_install_dir), seperator: ':') env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink')