--- data/shell-completions/bash/meson.orig	2020-08-03 09:20:31.000000000 -0700
+++ data/shell-completions/bash/meson	2020-08-03 09:21:01.000000000 -0700
@@ -114,6 +114,7 @@
     cross-file)
       _filedir
       COMPREPLY+=($(_filedir_in "$XDG_DATA_DIRS"/meson/cross))
+      COMPREPLY+=($(_filedir_in @@PREFIX@@/share/@@SUBPORT@@meson/cross))
       COMPREPLY+=($(_filedir_in /usr/local/share/meson/cross))
       COMPREPLY+=($(_filedir_in /usr/share/meson/cross))
       COMPREPLY+=($(_filedir_in "$XDG_DATA_HOME"/meson/cross))
--- ./mesonbuild/coredata.py.orig	2020-08-03 09:46:13.000000000 -0700
+++ ./mesonbuild/coredata.py	2020-08-03 09:46:49.000000000 -0700
@@ -431,7 +431,7 @@
             if sys.platform != 'win32':
                 paths = [
                     os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
-                ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
+                ] + os.environ.get('XDG_DATA_DIRS', '@@PREFIX@@/share/@@SUBPORT@@:/usr/local/share:/usr/share').split(':')
                 for path in paths:
                     path_to_try = os.path.join(path, 'meson', ftype, f)
                     if os.path.isfile(path_to_try):