aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMax Howell2012-09-02 11:21:07 -0400
committerMax Howell2012-09-02 11:22:12 -0400
commitf3f30340d78a43ea3e36f99e031a7c18efcb2e71 (patch)
treed9858f1b2f2b36482a6503590d62401c127bdca8 /Library
parent05db03fddc059f6e61663fff20b9c129a4db64bf (diff)
downloadhomebrew-f3f30340d78a43ea3e36f99e031a7c18efcb2e71.tar.bz2
bsdmake is *not* provided by Xcode/CLT
Fixes #14626. Also make proctools install do prefixes other than /usr/local.
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/ENV/4.3/make7
-rw-r--r--Library/Formula/proctools.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make
index 7e5196e6a..5ec9dceb1 100755
--- a/Library/ENV/4.3/make
+++ b/Library/ENV/4.3/make
@@ -1,3 +1,8 @@
#!/bin/sh
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-exec xcrun make "$@"
+if [ $(basename "$0") == "bsdmake" ]; then
+ pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ exec "$pwd/../../../bin/bsdmake" "$@"
+else
+ exec xcrun make "$@"
+fi
diff --git a/Library/Formula/proctools.rb b/Library/Formula/proctools.rb
index 70ec864ed..7c251b09a 100644
--- a/Library/Formula/proctools.rb
+++ b/Library/Formula/proctools.rb
@@ -22,7 +22,7 @@ class Proctools < Formula
end
def install
- system "bsdmake"
+ system "bsdmake", "PREFIX=#{prefix}"
["pgrep/pgrep", "pkill/pkill", "pfind/pfind"].each do |prog|
bin.install prog