about summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-04-04 13:28:13 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-04-04 13:28:13 +0000
commit4407e6464f29e9eb1c44cad5e4e8d72f447f5b55 (patch)
tree5a1ebf14788062189070c2f09676f3bea092f617 /pkgs/development/python-modules
parentfbfb7714d00f5d3807b432ba9beb71920681f666 (diff)
downloadnixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar.gz
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar.bz2
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar.lz
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar.xz
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.tar.zst
nixlib-4407e6464f29e9eb1c44cad5e4e8d72f447f5b55.zip
* Remove the hard-coded reference to Python 2.6.
svn path=/nixpkgs/branches/modular-python/; revision=26676
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/rhpl/builder.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh
index 5c56b70c24f9..b37e9081832f 100644
--- a/pkgs/development/python-modules/rhpl/builder.sh
+++ b/pkgs/development/python-modules/rhpl/builder.sh
@@ -4,8 +4,9 @@ rpm2cpio $src | cpio -idv
 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