Date: Monday, May 13, 2013 @ 00:34:01 Author: seblu Revision: 90490 upgpkg: bird 1.3.10-2
https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ Modified: bird/trunk/PKGBUILD bird/trunk/bird.service bird/trunk/bird6.service ---------------+ PKGBUILD | 24 +++++++++++++++++------- bird.service | 6 +++--- bird6.service | 6 +++--- 3 files changed, 23 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-12 22:21:54 UTC (rev 90489) +++ PKGBUILD 2013-05-12 22:34:01 UTC (rev 90490) @@ -4,7 +4,7 @@ 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 @@ 'bird.service' 'bird6.service') md5sums=('553c331b32bca9e926519cb2f67d68be' - 'ccd12c994501e28a7256a6a2a17154b2' - '631eea3de9be2f259aaf91f281d2d39a') + '01360e3b71ff2ed2223e87a3176e0659' + '13a5f066a39f82136291f1461458651c') build() { cd $pkgbase-$pkgver @@ -24,12 +24,12 @@ # 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 @@ 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 @@ 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 Modified: bird.service =================================================================== --- bird.service 2013-05-12 22:21:54 UTC (rev 90489) +++ bird.service 2013-05-12 22:34:01 UTC (rev 90490) @@ -3,9 +3,9 @@ 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 Modified: bird6.service =================================================================== --- bird6.service 2013-05-12 22:21:54 UTC (rev 90489) +++ bird6.service 2013-05-12 22:34:01 UTC (rev 90490) @@ -3,9 +3,9 @@ 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
