From a7c29271b89ac077f27303087eb8926048e0d89b Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Tue, 22 Oct 2013 22:36:41 +0100
Subject: CLT: rename Mavericks CLT path constant.

---
 Library/Homebrew/os/mac.rb       | 5 ++---
 Library/Homebrew/os/mac/xcode.rb | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 30e4d92d4..d92a03954 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -51,9 +51,8 @@ module OS
     end
 
     def dev_tools_path
-      @dev_tools_path ||= if tools_in_prefix? CLT::STANDALONE_PKG_PATH
-        # In 10.9 the CLT moved from /usr into /Library/Developer/CommandLineTools.
-        Pathname.new "#{CLT::STANDALONE_PKG_PATH}/usr/bin"
+      @dev_tools_path ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH
+        Pathname.new "#{CLT::MAVERICKS_PKG_PATH}/usr/bin"
       elsif tools_in_prefix? "/"
         # probably a safe enough assumption (the unix way)
         Pathname.new "/usr/bin"
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 22299c2e9..3f0868b53 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -163,7 +163,7 @@ module OS
 
       STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
       FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
-      STANDALONE_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
+      MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
 
       # True if:
       #  - Xcode < 4.3 is installed. The tools are found under /usr.
@@ -175,8 +175,8 @@ module OS
       end
 
       def mavericks_dev_tools?
-        MacOS.dev_tools_path == Pathname("#{STANDALONE_PKG_PATH}/usr/bin") &&
-          File.directory?("#{STANDALONE_PKG_PATH}/usr/include")
+        MacOS.dev_tools_path == Pathname("#{MAVERICKS_PKG_PATH}/usr/bin") &&
+          File.directory?("#{MAVERICKS_PKG_PATH}/usr/include")
       end
 
       def usr_dev_tools?
-- 
cgit v1.2.3