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

[Allan McRae]

    Date: Tuesday, August 17, 2010 @ 08:14:27
  Author: allan
Revision: 87612

upgpkg: python2 2.7-1
improve split between python 2 and 3

Modified:
  python2/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-17 11:37:43 UTC (rev 87611)
+++ PKGBUILD	2010-08-17 12:14:27 UTC (rev 87612)
@@ -30,14 +30,16 @@
 
 package() {
   cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} altinstall
 
-  rm ${pkgdir}/usr/bin/python
-  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever} $pkgdir/usr/bin/python2
+  ln -sf python${_pybasever}-config $pkgdir/usr/bin/python2-config
 
   ln -sf ../../libpython${_pybasever}.so \
     ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
+  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
+
   # clean-up reference to build directory
   sed -i "s#$srcdir/Python-${pkgver}:##" \
     $pkgdir/usr/lib/python${_pybasever}/config/Makefile
@@ -52,8 +54,6 @@
   # fix conflicts with python
   mv $pkgdir/usr/bin/idle{,2}
   mv $pkgdir/usr/bin/pydoc{,2}
-  rm $pkgdir/usr/bin/python-config
-  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
 
   # license
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE