Author: eelco
Date: Mon Apr 4 13:28:13 2011
New Revision: 26676
URL: https://svn.nixos.org/websvn/nix/?rev=26676&sc=1
Log:
* Remove the hard-coded reference to Python 2.6.
Modified:
nixpkgs/branches/modular-python/pkgs/development/python-modules/rhpl/builder.sh
Modified:
nixpkgs/branches/modular-python/pkgs/development/python-modules/rhpl/builder.sh
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/development/python-modules/rhpl/builder.sh
Mon Apr 4 09:28:00 2011 (r26675)
+++
nixpkgs/branches/modular-python/pkgs/development/python-modules/rhpl/builder.sh
Mon Apr 4 13:28:13 2011 (r26676)
@@ -4,8 +4,9 @@
tar xfvj rhpl-*.tar.bz2
rm rhpl-*.tar.bz2
cd rhpl-*
-sed -i -e "s@/usr/include/\$(PYTHON)@$python/include/python2.6@" \
- -e "s@PYTHONLIBDIR =
/usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR =
$out/lib/python2.6/site-packages@" Makefile.inc
+incl=$(echo $python/include/python2.*)
+sed -i -e "s@/usr/include/\$(PYTHON)@$incl@" \
+ -e "s@PYTHONLIBDIR =
/usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $(toPythonPath $out)@"
Makefile.inc
sed -i -e "s@/usr/bin/install@install@g" \
-e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile
make PREFIX=$out
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
