3 files changed, 24 insertions, 14 deletions
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 2214d82be..3a4f77974 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90166 2013-05-07 19:14:15Z seblu $
+# $Id: PKGBUILD 90491 2013-05-12 22:34:17Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
 md5sums=('553c331b32bca9e926519cb2f67d68be'
-         'ccd12c994501e28a7256a6a2a17154b2'
-         '631eea3de9be2f259aaf91f281d2d39a')
+         '01360e3b71ff2ed2223e87a3176e0659'
+         '13a5f066a39f82136291f1461458651c')
 
 build() {
   cd $pkgbase-$pkgver
@@ -24,12 +24,12 @@ build() {
 
   # build ipv4 bird
   cd _build4
-  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var
+  ../configure
   make
 
   # build ipv6 bird
   cd ../_build6
-  ../configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var --enable-ipv6
+  ../configure --enable-ipv6
   make
 }
 
@@ -38,7 +38,12 @@ package_bird () {
   backup=('etc/bird.conf')
 
   cd $pkgbase-$pkgver/_build4
-  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
+  make \
+    prefix="$pkgdir/usr" \
+    sysconfdir="$pkgdir/etc" \
+    sbindir="$pkgdir/usr/bin" \
+    localstatedir="$pkgdir/var" \
+    install
   make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
@@ -53,7 +58,12 @@ package_bird6 () {
   backup=('etc/bird6.conf')
 
   cd $pkgbase-$pkgver/_build6
-  make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install
+  make \
+    prefix="$pkgdir/usr" \
+    sysconfdir="$pkgdir/etc" \
+    sbindir="$pkgdir/usr/bin" \
+    localstatedir="$pkgdir/var" \
+    install
   make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
diff --git a/community/bird/bird.service b/community/bird/bird.service
index f40068646..faee0d845 100644
--- a/community/bird/bird.service
+++ b/community/bird/bird.service
@@ -3,9 +3,9 @@ Description=BIRD routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/bird -d
-ExecReload=/usr/sbin/birdc configure
-ExecStop=/usr/sbin/birdc down
+ExecStart=/usr/bin/bird -d
+ExecReload=/usr/bin/birdc configure
+ExecStop=/usr/bin/birdc down
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/bird/bird6.service b/community/bird/bird6.service
index 284c75842..8eb1dd505 100644
--- a/community/bird/bird6.service
+++ b/community/bird/bird6.service
@@ -3,9 +3,9 @@ Description=BIRD IPv6 routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/bird6 -d
-ExecReload=/usr/sbin/bird6c configure
-ExecStop=/usr/sbin/bird6c down
+ExecStart=/usr/bin/bird6 -d
+ExecReload=/usr/bin/bird6c configure
+ExecStop=/usr/bin/bird6c down
 
 [Install]
 WantedBy=multi-user.target