diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
| commit | 44fb7936931db66f6ba7c46f73ebb29d2725fe58 (patch) | |
| tree | 0be1bc01e36b6aea80bbae6a00f7cee123a162c3 /libre/lirc-libre | |
| parent | de83d1a9287e1d73029b1202069e3cefae26bb31 (diff) | |
| parent | 108181f9a57602fd8d527dafb3b46fc0b59711df (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/lirc-libre')
| -rw-r--r-- | libre/lirc-libre/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/lirc-libre/lirc.install | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d6a294fe6..3b73a9f2f 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=18 +pkgrel=20 epoch=1 _extramodules=extramodules-3.4-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -34,7 +34,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '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" @@ -51,7 +51,7 @@ build() { 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 @@ -71,7 +71,7 @@ package_lirc-libre() { 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" @@ -108,5 +108,5 @@ package_lirc-utils-libre() { install -d "${pkgdir}/etc/lirc" # remove built modules - rm -r "${pkgdir}/lib/" + rm -r "${pkgdir}/usr/lib/modules" } diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index d6b9e5ff2..c50e384c8 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -3,7 +3,7 @@ EXTRAMODULES=extramodules-3.4-LIBRE 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() { |