[arch-commits] Commit in iputils/trunk (PKGBUILD)

[Allan McRae]

    Date: Tuesday, June 15, 2010 @ 00:22:56
  Author: allan
Revision: 82625

fix $startdir usage

Modified:
  iputils/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-15 04:20:07 UTC (rev 82624)
+++ PKGBUILD	2010-06-15 04:22:56 UTC (rev 82625)
@@ -25,13 +25,13 @@
 build()
 {
   #build iptuils
-  cd $startdir/src/$pkgname-s$pkgver
+  cd $srcdir/$pkgname-s$pkgver
   make KERNEL_INCLUDE=/usr/include || return 1   # for i686
   for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
-    install -D -m755 $i $startdir/pkg/usr/sbin/$i
+    install -D -m755 $i $pkgdir/usr/sbin/$i
   done
   for i in ping ping6 traceroute6; do
-    install -D -m4755 $i $startdir/pkg/bin/$i
+    install -D -m4755 $i $pkgdir/bin/$i
   done
 
   msg ":: building docs"
@@ -46,16 +46,16 @@
       xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.75.2/manpages/docbook.xsl $xf
   done
 
-  mkdir -p $startdir/pkg/usr/share/man/man8
+  mkdir -p $pkgdir/usr/share/man/man8
   install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \
                     tftpd.8 tracepath.8 tracepath6.8 traceroute6.8 \
-                    $startdir/pkg/usr/share/man/man8/
+                    $pkgdir/usr/share/man/man8/
 
   # build traceroute
   # this is combined in this package because it's awkward as a separate package
-  cd ${startdir}/src/traceroute-$_traceroutever
+  cd ${srcdir}/traceroute-$_traceroutever
   patch -Np1 -i ../permission-fix.patch || return 1
   ./configure --prefix=/usr --sbindir=/bin --mandir=/usr/share/man
   make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
-  make DESTDIR=${startdir}/pkg install install-man
+  make DESTDIR=${pkgdir} install install-man
 }