From 273f5b2ddd66859c3081fa30e27baa3833c60f2f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 18 Oct 2013 12:56:51 -0500 Subject: [PATCH] Merge XQuartz and X11 modules --- Library/Homebrew/os/mac/xquartz.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb index 82680d3ba2..c906da38e4 100644 --- a/Library/Homebrew/os/mac/xquartz.rb +++ b/Library/Homebrew/os/mac/xquartz.rb @@ -1,5 +1,7 @@ module OS module Mac + X11 = XQuartz = Module.new + module XQuartz extend self @@ -87,18 +89,6 @@ module OS def installed? !version.nil? && !prefix.nil? end - end - - module X11 - extend self - - def prefix - MacOS::XQuartz.prefix - end - - def installed? - MacOS::XQuartz.installed? - end # If XQuartz and/or the CLT are installed, headers will be found under # /opt/X11/include or /usr/X11/include. For Xcode-only systems, they are