--- data/shell-completions/bash/meson.orig	2024-09-20 13:16:21.000000000 -0500
+++ data/shell-completions/bash/meson	2024-09-28 13:50:32.000000000 -0500
@@ -183,6 +183,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	2024-09-20 13:16:26.000000000 -0500
+++ mesonbuild/coredata.py	2024-09-28 13:50:32.000000000 -0500
@@ -328,7 +328,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):