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

[Eric Bélanger]

    Date: Friday, March 22, 2013 @ 01:07:08
  Author: eric
Revision: 86761

Remove pkgdir reference in build function

Modified:
  gdal/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-21 22:59:23 UTC (rev 86760)
+++ PKGBUILD	2013-03-22 00:07:08 UTC (rev 86761)
@@ -29,8 +29,8 @@
   # bug 23654
   export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
 
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch"
 
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure
@@ -45,21 +45,20 @@
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
   sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
 
   make
 }
 
 package () {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages/"
+  make DESTDIR="${pkgdir}" install
 
-  make DESTDIR=${pkgdir} install
-
 # install license
-  install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 #FS15477 clean up junks
-  rm -f ${pkgdir}/usr/bin/*.dox
+  rm -f "${pkgdir}"/usr/bin/*.dox
 
   # Remove RPATH
   chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so