From 3834cfb8a72fea87790a6380cd20977a30a38dd8 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Thu, 5 Dec 2013 20:33:36 -0800 Subject: [PATCH] bazaar: use standalone install Closes Homebrew/homebrew#24787. --- Formula/bazaar.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Formula/bazaar.rb b/Formula/bazaar.rb index 1041508da9..f3153ffb77 100644 --- a/Formula/bazaar.rb +++ b/Formula/bazaar.rb @@ -4,22 +4,20 @@ class Bazaar < Formula homepage 'http://bazaar-vcs.org/' url 'https://launchpad.net/bzr/2.6/2.6.0/+download/bzr-2.6.0.tar.gz' sha1 '5eb4d0367c6d83396250165da5bb2c8a9f378293' - - depends_on :python - def install + ENV.j1 # Builds aren't parallel-safe + # Make and install man page first system "make man1/bzr.1" man1.install "man1/bzr.1" - python do - # In this python block, the site-packages are already set up - system python, "setup.py", "install", "--prefix=#{prefix}" - (prefix/'man').rmtree - end - end + # Put system Python first in path + ENV.prepend_path "PATH", "/System/Library/Frameworks/Python.framework/Versions/Current/bin" - def caveats - python.standard_caveats if python + system "make" + inreplace "bzr", "#! /usr/bin/env python", "#!/usr/bin/python" + libexec.install 'bzr', 'bzrlib' + + bin.install_symlink libexec+'bzr' end end