Luc Verhaegen.
>From a280751e9dc3fa75fe4355edbb44815781547fc7 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <[EMAIL PROTECTED]>
Date: Wed, 29 Oct 2008 17:24:13 +0100
Subject: [PATCH] Automake: stop polluting ${prefix}/include
Fix up Makefiles and pkg-config file so that headers are installed into
${prefix}/include/drm instead of ${prefix}/include. This used to be true for
xf86drm.h and previously dri_bufmgr.h and now intel_bufmgr.h.
---
libdrm.pc.in | 2 +-
libdrm/Makefile.am | 2 +-
libdrm/intel/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libdrm.pc.in b/libdrm.pc.in
index 6e00597..7cd5155 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}/drm
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index 63f6e64..0f431a3 100644
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -28,7 +28,7 @@ AM_CFLAGS = -I$(top_srcdir)/shared-core
libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
libdrm_lists.h
-libdrmincludedir = ${includedir}
+libdrmincludedir = ${includedir}/drm
libdrminclude_HEADERS = xf86drm.h
EXTRA_DIST = ChangeLog TODO
diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am
index 5e3dee0..4989539 100644
--- a/libdrm/intel/Makefile.am
+++ b/libdrm/intel/Makefile.am
@@ -42,5 +42,5 @@ libdrm_intel_la_SOURCES = \
mm.c \
mm.h
-libdrm_intelincludedir = ${includedir}
+libdrm_intelincludedir = ${includedir}/drm
libdrm_intelinclude_HEADERS = intel_bufmgr.h
--
1.5.2.4
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
