Merge XQuartz and X11 modules

2013-10-18 12:56:51 -05:00 · 2013-10-18 12:56:51 -05:00 · 273f5b2ddd
commit 273f5b2ddd
parent 8887fe7606
1 changed files with 2 additions and 12 deletions
--- 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