[arch-commits] Commit in wireless_tools/repos (core-x86_64 core-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Wednesday, February 10, 2010 @ 15:57:40
  Author: giovanni
Revision: 68134

Merged revisions 68132 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/wireless_tools/trunk

........
  r68132 | giovanni | 2010-02-10 21:55:24 +0100 (mer, 10 feb 2010) | 1 line
........

Modified:
  wireless_tools/repos/core-x86_64/	(properties)
  wireless_tools/repos/core-x86_64/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


Property changes on: wireless_tools/repos/core-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /wireless_tools/trunk:1-38713
   + /wireless_tools/trunk:1-68133

Modified: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2010-02-10 20:56:38 UTC (rev 68133)
+++ core-x86_64/PKGBUILD	2010-02-10 20:57:40 UTC (rev 68134)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributer: Jason Chu <jchu at xentac.net>
+
 pkgname=wireless_tools
 pkgver=29
 pkgrel=3
 pkgdesc="Wireless Tools"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 license=('GPL')
 depends=('glibc')
@@ -15,8 +16,9 @@
          '027576534885b8d5dded9be546057b12')
 
 build() {
-  cd $srcdir/wireless_tools.29
+  cd ${srcdir}/wireless_tools.29
+
   make || return 1
-  make INSTALL_DIR=$pkgdir/usr/sbin INSTALL_LIB=$pkgdir/usr/lib INSTALL_INC=$pkgdir/usr/include INSTALL_MAN=$pkgdir/usr/share/man install || return 1
-  install -D -m644 ../wireless.conf.d $startdir/pkg/etc/conf.d/wireless
+  make INSTALL_DIR="${pkgdir}/usr/sbin" INSTALL_LIB="${pkgdir}/usr/lib" INSTALL_INC="${pkgdir}/usr/include" INSTALL_MAN="${pkgdir}/usr/share/man" install || return 1
+  install -D -m644 ${srcdir}/wireless.conf.d "${pkgdir}/etc/conf.d/wireless" || return 1
 }