From patchwork Fri Feb 26 18:07:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Cristau X-Patchwork-Id: 82430 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1QIBaDJ010061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 26 Feb 2010 18:12:14 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1Nl4dp-0004KS-HK; Fri, 26 Feb 2010 18:10:21 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.122] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1Nl4bO-0002Ln-Uj for dri-devel@lists.sourceforge.net; Fri, 26 Feb 2010 18:07:50 +0000 X-ACL-Warn: Received: from coloquinte.cristau.org ([91.121.16.100]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1Nl4bN-0004Us-Ig for dri-devel@lists.sourceforge.net; Fri, 26 Feb 2010 18:07:50 +0000 Received: from patate.is-a-geek.org (unknown [132.227.81.58]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by coloquinte.cristau.org (Postfix) with ESMTPSA id E5599BBA0; Fri, 26 Feb 2010 19:07:32 +0100 (CET) Received: by patate.is-a-geek.org (Postfix, from userid 1000) id CCF6D7ED1; Fri, 26 Feb 2010 19:07:27 +0100 (CET) From: Julien Cristau To: dri-devel@lists.sf.net Subject: [PATCH 3/3] Install headers to $(includedir)/libdrm Date: Fri, 26 Feb 2010 19:07:24 +0100 Message-Id: <1267207644-498-3-git-send-email-jcristau@debian.org> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1267207644-498-2-git-send-email-jcristau@debian.org> References: <1267207644-498-1-git-send-email-jcristau@debian.org> <1267207644-498-2-git-send-email-jcristau@debian.org> X-Spam-Score: -0.4 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.4 AWL AWL: From: address is in the auto white-list X-Headers-End: 1Nl4bN-0004Us-Ig X-Mailman-Approved-At: Fri, 26 Feb 2010 18:10:21 +0000 Cc: Julien Cristau X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Feb 2010 18:12:14 +0000 (UTC) diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am index 9046955..43695bd 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 6e00597..b46e2a6 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 5d759c5..b6d214a 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 6ae6287..c78a28a 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 29af1df..de78232 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 ab703e1..68ef0ab 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