cleanup namcap warnings & fix noinst header

1 files changed, 20 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5fcce820028b..069bfbd31a5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=neard
 pkgver=0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel's Near Field Communication manager"
 arch=('i686' 'x86_64')
 url="https://01.org/linux-nfc/"
 license=('GPL2')
-depends=('glibc' 'dbus>=1.2' 'libnl' 'glib2>=2.28')
+depends=('dbus>=1.2' 'libnl' 'glib2>=2.28')
 makedepends=('automake' 'autoconf>=2.60' 'libtool')
 backup=(etc/neard/main.conf)
 source=(https://git.kernel.org/cgit/network/nfc/neard.git/snapshot/$pkgname-$pkgver.tar.gz
@@ -20,27 +20,38 @@ md5sums=('c3d07aaefb394896656c1fdfb7ffa2b5'
          '1e3cfed20a3dbdb7ee9d0946e1c8dc81'
          '3968d529bd6d1604f7e2ee3ce18fd3b6')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+prepare() {
+  cd $pkgname-$pkgver
   patch -p1 -i $srcdir/bindir.patch
-
   patch -p1 -i $srcdir/config.patch
+}
 
-  ./bootstrap && \
+build() {
+  cd $pkgname-$pkgver
+  ./bootstrap &&
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --disable-debug \
     --enable-tools
 
-  make
+  make ${MAKEFLAGS}
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make ${MAKEFLAGS} DESTDIR="$pkgdir/" install
+
+  # This is a nodist header, but it still is installed for some reason
+  # Having it installed breaks some packages that look for a local version.h
+  # include, so remove it
+  rm -f "${pkgdir}/usr/include/version.h"
+
+  # libtool automatically adds a "$builddir/usr/lib"
+  chrpath -d "${pkgdir}/usr/bin/nciattach"
+  chrpath -d "${pkgdir}/usr/bin/neard"
+  chrpath -d "${pkgdir}/usr/bin/nfctool"
 
   install -D -m644 "${srcdir}/neard.service" \
     "${pkgdir}/usr/lib/systemd/system/neard.service"