[arch-commits] Commit in lirc/trunk (PKGBUILD lirc.install)

[Dave Reisner]

    Date: Tuesday, July 3, 2012 @ 20:49:26
  Author: dreisner
Revision: 162933

upgpkg: lirc 1:0.9.0-19

- rebuild for kernel move to /usr

Modified:
  lirc/trunk/PKGBUILD
  lirc/trunk/lirc.install

--------------+
 PKGBUILD     |   10 +++++-----
 lirc.install |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-04 00:48:33 UTC (rev 162932)
+++ PKGBUILD	2012-07-04 00:49:26 UTC (rev 162933)
@@ -4,7 +4,7 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=18
+pkgrel=19
 epoch=1
 _extramodules=extramodules-3.4-ARCH
 arch=('i686' 'x86_64')
@@ -32,7 +32,7 @@
          '69d099e6deedfa3c1ee2b6e82d9b8bfb')
 
 build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
   cd "${srcdir}/lirc-${pkgver}"
   patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -49,7 +49,7 @@
 
   PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
       --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+      --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
       --with-transmitter
 
   # Remove drivers already in kernel
@@ -67,7 +67,7 @@
   install=lirc.install
 
   cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
+  make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
 
   # set the kernel we've built for inside the install script
   sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
@@ -101,5 +101,5 @@
   install -d "${pkgdir}/etc/lirc"
   
   # remove built modules
-  rm -r "${pkgdir}/lib/"
+  rm -r "${pkgdir}/usr/lib/"
 }

Modified: lirc.install
===================================================================
--- lirc.install	2012-07-04 00:48:33 UTC (rev 162932)
+++ lirc.install	2012-07-04 00:49:26 UTC (rev 162933)
@@ -3,7 +3,7 @@
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }
 
 post_upgrade() {