From 976e779f9cd0571dd2c218580485b39d37bd18a0 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 26 Feb 2010 19:07:24 +0100 Subject: Install headers to $(includedir)/libdrm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids conflicts with kernel headers. Signed-off-by: Julien Cristau Reviewed-by: Rémi Cardona Signed-off-by: Eric Anholt --- include/drm/Makefile.am | 2 +- libdrm.pc.in | 2 +- nouveau/Makefile.am | 2 +- nouveau/libdrm_nouveau.pc.in | 2 +- radeon/Makefile.am | 2 +- radeon/libdrm_radeon.pc.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am index 9046955f..43695bdf 100644 --- a/include/drm/Makefile.am +++ b/include/drm/Makefile.am @@ -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 \ diff --git a/libdrm.pc.in b/libdrm.pc.in index 6e00597e..b46e2a64 100644 --- a/libdrm.pc.in +++ b/libdrm.pc.in @@ -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 diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 5d759c5e..b6d214af 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -34,7 +34,7 @@ libdrm_nouveaucommoninclude_HEADERS = \ nouveau_reloc.h -libdrm_nouveauincludedir = ${includedir}/drm +libdrm_nouveauincludedir = ${includedir}/libdrm libdrm_nouveauinclude_HEADERS = \ nouveau_drmif.h diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in index 6ae62876..c78a28a7 100644 --- a/nouveau/libdrm_nouveau.pc.in +++ b/nouveau/libdrm_nouveau.pc.in @@ -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 diff --git a/radeon/Makefile.am b/radeon/Makefile.am index 29af1df2..de782322 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -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 \ diff --git a/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in index ab703e13..68ef0ab1 100644 --- a/radeon/libdrm_radeon.pc.in +++ b/radeon/libdrm_radeon.pc.in @@ -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 -- cgit v1.2.3