diff options
| author | papaeye | 2012-07-26 17:12:15 +0900 |
|---|---|---|
| committer | Adam Vandenberg | 2012-07-26 07:01:03 -0700 |
| commit | 2b75eeaa5b004c9c09a53338ad905acfc78e14bb (patch) | |
| tree | 1194359a63080e9d792b1ce7d6a81968d3df3c85 /Library/Formula | |
| parent | 6db44fbd20987b69472f3701ad69d433f5a1eaf2 (diff) | |
| download | homebrew-2b75eeaa5b004c9c09a53338ad905acfc78e14bb.tar.bz2 | |
pypy: Fix the location of distutils.cfg
In PyPy 1.9, the directory "lib-python/modified-2.7" has been removed,
and its content merged into "lib-python/2.7" (from whatsnew-1.9.rst).
In PyPy 1.4.1, the location is "lib-python/modified-2.5.2".
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/pypy.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Library/Formula/pypy.rb b/Library/Formula/pypy.rb index 28471a420..608ed85b6 100644 --- a/Library/Formula/pypy.rb +++ b/Library/Formula/pypy.rb @@ -35,7 +35,7 @@ class Pypy < Formula # Tell distutils-based installers where to put scripts scripts_folder.mkpath - (prefix+"lib-python/modified-2.7/distutils/distutils.cfg").write <<-EOF.undent + (distutils+"distutils.cfg").write <<-EOF.undent [install] install-scripts=#{scripts_folder} EOF @@ -57,7 +57,7 @@ class Pypy < Formula def caveats message = <<-EOS.undent A "distutils.cfg" has been written to: - #{lib}/pypy/distutils + #{distutils} specifing the install-scripts folder as: #{scripts_folder} @@ -92,4 +92,13 @@ class Pypy < Formula def scripts_folder HOMEBREW_PREFIX+"share/pypy" end + + # The Cellar location of distutils + def distutils + if MacOS.prefer_64_bit? + prefix+"lib-python/2.7/distutils" + else + prefix+"lib-python/modified-2.5.2/distutils" + end + end end |
