diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-22 17:58:51 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-22 17:58:51 +0530 |
commit | 71cf22cc19a41c578a1f24721d66ce6c3a4d24cb (patch) | |
tree | 388d342980a5c8c1c0c5c01183667425e38f7793 /gst-uninstalled.py | |
parent | 43c107d4fe5ea0811e5019864351b1a0dad81c1c (diff) |
gst-uninstalled: Match plugin path when lib64 is libdir
Fixes setting of GST_PLUGIN_PATH on Fedora 64-bit
Diffstat (limited to 'gst-uninstalled.py')
-rwxr-xr-x | gst-uninstalled.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-uninstalled.py b/gst-uninstalled.py index 724f748..acd91b3 100755 --- a/gst-uninstalled.py +++ b/gst-uninstalled.py @@ -45,6 +45,7 @@ def get_subprocess_env(options): sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll') typelib_reg = re.compile(r'.*\.typelib$') + pluginpath_reg = re.compile(r'lib\w*' + os.path.normpath('/gstreamer-1.0/')) if os.name is 'nt': lib_path_envvar = 'PATH' @@ -69,8 +70,7 @@ def get_subprocess_env(options): elif sharedlib_reg.search(filename): if target.get('type') != "shared library": continue - - if os.path.normpath("lib/gstreamer-1.0") in os.path.normpath(target.get('install_filename')): + if pluginpath_reg.search(os.path.normpath(target.get('install_filename'))): prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(options.builddir, root)) continue |