drm: Branch 'master'

 nouveau/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e34ad590e0e1003a597b8cc790a3f36830ba993
Author: Dylan Baker <[email protected]>
Date:   Thu Jan 25 15:44:37 2018 -0800

    meson: fix libdrm_nouveau pkgconfig include directories
    
    Signed-off-by: Dylan Baker <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/nouveau/meson.build b/nouveau/meson.build
index bfecf84b..f031cd63 100644
--- a/nouveau/meson.build
+++ b/nouveau/meson.build
@@ -45,7 +45,7 @@ install_headers(
 pkg.generate(
   name : 'libdrm_nouveau',
   libraries : libdrm_nouveau,
-  subdirs : ['.', 'nouveau'],
+  subdirs : ['.', 'libdrm', 'libdrm/nouveau'],
   version : meson.project_version(),
   requires_private : 'libdrm',
   description : 'Userspace interface to nouveau kernel DRM services',

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