From 631d76ade9a54223b211e4cbe317ed696a7e854c Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sat, 26 Feb 2011 17:19:31 +0000
Subject: [PATCH] fix fileconflict

---
 nouveau-drm-lts/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nouveau-drm-lts/PKGBUILD b/nouveau-drm-lts/PKGBUILD
index 423166061..076ee7afe 100644
--- a/nouveau-drm-lts/PKGBUILD
+++ b/nouveau-drm-lts/PKGBUILD
@@ -13,7 +13,7 @@ _kernver=`uname -r`
 pkgname=nouveau-drm-lts
 _snapdate=20100809
 pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
-pkgrel=1
+pkgrel=2
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -35,7 +35,7 @@ provides=("nouveau-drm=$pkgver")
 
 build() {
   cd ${srcdir}/master
-  mkdir nouveau
+  mkdir -p nouveau
   cp $srcdir/Makefile ${srcdir}/master/nouveau/
   cd nouveau
   make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" || return 1
@@ -45,7 +45,7 @@ build() {
   install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko || return 1
   install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko || return 1
   install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko || return 1
-  install -D -m 0644 ${srcdir}/master/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
+  install -D -m 0644 ${srcdir}/master/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm-lts.h || return 1
 
   # install script
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install