From 4407e6464f29e9eb1c44cad5e4e8d72f447f5b55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Apr 2011 13:28:13 +0000 Subject: [PATCH] * Remove the hard-coded reference to Python 2.6. svn path=/nixpkgs/branches/modular-python/; revision=26676 --- pkgs/development/python-modules/rhpl/builder.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh index 5c56b70c24f..b37e9081832 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