Install headers to $(includedir)/libdrm
authorJulien Cristau <jcristau@debian.org>
Fri, 26 Feb 2010 18:07:24 +0000 (19:07 +0100)
committerEric Anholt <eric@anholt.net>
Wed, 17 Mar 2010 19:45:46 +0000 (12:45 -0700)
Avoids conflicts with kernel headers.

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: RĂ©mi Cardona <remi@gentoo.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
include/drm/Makefile.am
libdrm.pc.in
nouveau/Makefile.am
nouveau/libdrm_nouveau.pc.in
radeon/Makefile.am
radeon/libdrm_radeon.pc.in

index 9046955f9559917bdbc9cc46456a835d726a0d8b..43695bdf200468ab57c28c4773f1314fa15047c7 100644 (file)
@@ -22,7 +22,7 @@
 # however, r300 and via need their reg headers installed in order to build.
 # better solutions are welcome.
 
-klibdrmincludedir = ${includedir}/drm
+klibdrmincludedir = ${includedir}/libdrm
 klibdrminclude_HEADERS = \
        drm.h \
        drm_mode.h \
index 6e00597ebc3487eca408fa7a21f09fab79c1f085..b46e2a64d8c6b6190829225b16104b5cb66775c7 100644 (file)
@@ -7,4 +7,4 @@ Name: libdrm
 Description: Userspace interface to kernel DRM services
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm
-Cflags: -I${includedir} -I${includedir}/drm
+Cflags: -I${includedir} -I${includedir}/libdrm
index 5d759c5e48464e6e50bbfd176f3c0541f7ac47e5..b6d214afb0d4466ac5749e18b13f0d40de696557 100644 (file)
@@ -34,7 +34,7 @@ libdrm_nouveaucommoninclude_HEADERS = \
                                nouveau_reloc.h
 
 
-libdrm_nouveauincludedir = ${includedir}/drm
+libdrm_nouveauincludedir = ${includedir}/libdrm
 libdrm_nouveauinclude_HEADERS = \
                                nouveau_drmif.h
 
index 6ae6287637f71d4eb29bd901e06a45e4353d865d..c78a28a7fe3db5b76ccfe0043c79a3f8e4b1187d 100644 (file)
@@ -7,5 +7,5 @@ Name: libdrm_nouveau
 Description: Userspace interface to nouveau kernel DRM services
 Version: 0.6
 Libs: -L${libdir} -ldrm_nouveau
-Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau
+Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/nouveau
 Requires.private: libdrm
index 29af1df2313cf82061f8eb6be0e532e280979ca4..de782322f711bdea96ae080c818b9fbe6e185d8b 100644 (file)
@@ -41,7 +41,7 @@ libdrm_radeon_la_SOURCES = \
        radeon_bo.c \
        radeon_cs.c
 
-libdrm_radeonincludedir = ${includedir}/drm
+libdrm_radeonincludedir = ${includedir}/libdrm
 libdrm_radeoninclude_HEADERS = \
        radeon_bo.h \
        radeon_cs.h \
index ab703e13c12dedc6989511060b076b5b2c396f9e..68ef0ab14528d94b17abe643e8d93ac65e7a9c46 100644 (file)
@@ -7,4 +7,4 @@ Name: libdrm_radeon
 Description: Userspace interface to kernel DRM services for radeon
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm_radeon
-Cflags: -I${includedir} -I${includedir}/drm
+Cflags: -I${includedir} -I${includedir}/libdrm