drm: Branch 'master'

 amdgpu/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3509e7cd2b9098193b9f8c97ecd68fae929eb131
Author: Christoph Haag <[email protected]>
Date:   Thu Jan 18 19:01:55 2018 +0100

    meson: fix the install path of amdgpu.ids
    
    Signed-off-by: Dylan Baker <[email protected]>

diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 55ab9d1d..8b045205 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 
-datadir_amdgpu = join_paths(get_option('datadir'), 'libdrm', 'amdgpu.ids')
+datadir_amdgpu = join_paths(get_option('prefix'), get_option('datadir'), 'libdrm')
 
 libdrm_amdgpu = shared_library(
   'drm_amdgpu',
@@ -33,7 +33,7 @@ libdrm_amdgpu = shared_library(
   ],
   c_args : [
     warn_c_args,
-    '-DAMDGPU_ASIC_ID_TABLE="@0@"'.format(datadir_amdgpu),
+    '-DAMDGPU_ASIC_ID_TABLE="@0@"'.format(join_paths(datadir_amdgpu, 'amdgpu.ids')),
   ],
   include_directories : [inc_root, inc_drm],
   link_with : libdrm,

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--