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

[Allan McRae]

    Date: Saturday, February 20, 2010 @ 06:30:24
  Author: allan
Revision: 69366

upgpkg: which 2.20-2
rebuild to compress info page, remove texinfo dep

Modified:
  which/trunk/PKGBUILD
  which/trunk/which.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-20 11:28:09 UTC (rev 69365)
+++ PKGBUILD	2010-02-20 11:30:24 UTC (rev 69366)
@@ -1,24 +1,27 @@
 # $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=which
 pkgver=2.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility to show the full path of commands"
 arch=('i686' 'x86_64')
 url="http://www.xs4all.nl/~carlo17/which"
 license=('GPL3')
+groups=('base')
+depends=('glibc')
 install=which.install
-groups=('base')
-depends=('glibc' 'texinfo')
 source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('95be0501a466e515422cde4af46b2744')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg install
+}
 
-  rm -f ${pkgdir}/usr/share/info/dir
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }

Modified: which.install
===================================================================
--- which.install	2010-02-20 11:28:09 UTC (rev 69365)
+++ which.install	2010-02-20 11:30:24 UTC (rev 69366)
@@ -2,8 +2,9 @@
 filelist=(which.info)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -12,9 +13,8 @@
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et: