[arch-commits] Commit in flac/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Friday, May 29, 2009 @ 20:25:09
  Author: jgc
Revision: 40697

Merged revisions 40696 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/flac/trunk

........
  r40696 | jgc | 2009-05-30 02:24:17 +0200 (Sat, 30 May 2009) | 2 lines
  
  Use srcdir/pkgdir, replace ../ with $srcdir/.
........

Modified:
  flac/repos/extra-i686/	(properties)
  flac/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


Property changes on: flac/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /flac/trunk:1-16017
   + /flac/trunk:1-40696

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-30 00:24:17 UTC (rev 40696)
+++ extra-i686/PKGBUILD	2009-05-30 00:25:09 UTC (rev 40697)
@@ -16,14 +16,13 @@
 md5sums=('153c8b15a54da428d1f0fadc756c22c7' 'b9d245422bbc547b18a72897366bea77')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver || return 1
-  patch -p1 < ../flac-1.2.1-gcc-4.3-includes.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" || return 1
   ./configure --prefix=/usr --enable-shared --disable-sse \
     --disable-rpath --with-pic || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
   # install license
-  install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING.Xiph \
-                  $startdir/pkg/usr/share/licenses/$pkgname/COPYING.Xiph
+  install -Dm0644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.Xiph" || return 1
 }