From 0ccfb3bbb28b48a46541eb46eabfe368d03bc9c0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 29 Sep 2012 14:49:15 -0400
Subject: [PATCH] let's not -DOSX, that results in unwanted mangling

---
 Assistant/WebApp/DashBoard.hs                   | 2 +-
 Makefile                                        | 2 +-
 Utility/WebApp.hs                               | 2 +-
 doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn | 2 ++
 git-annex.cabal                                 | 3 ---
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs
index 8c67ccb7eb..e2143b6455 100644
--- a/Assistant/WebApp/DashBoard.hs
+++ b/Assistant/WebApp/DashBoard.hs
@@ -142,7 +142,7 @@ openFileBrowser = do
 			return False
 		)
 	where
-#if OSX
+#ifdef darwin_HOST_OS
 		cmd = "open"
 #else
 		cmd = "xdg-open"
diff --git a/Makefile b/Makefile
index 10fdd76b1c..8b7e825549 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ else
 OPTFLAGS=-DWITH_KQUEUE
 clibs=Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
 ifeq ($(OS),Darwin)
-OPTFLAGS=-DWITH_KQUEUE -DOSX
+OPTFLAGS=-DWITH_KQUEUE
 # Ensure OSX compiler builds for 32 bit when using 32 bit ghc
 GHCARCH:=$(shell ghc -e 'print System.Info.arch')
 ifeq ($(GHCARCH),i386)
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index 3a55bd74a1..e11b3f411f 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -44,7 +44,7 @@ localhost = "localhost"
 runBrowser :: String -> IO Bool
 runBrowser url = boolSystem cmd [Param url]
 	where
-#if OSX
+#ifdef darwin_HOST_OS
 		cmd = "open"
 #else
 		cmd = "xdg-open"
diff --git a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn b/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
index da7c9bed10..43074915f0 100644
--- a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
+++ b/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
@@ -9,3 +9,5 @@ make: *** [git-annex] Error 1
 </pre>
 
 This was first introduced at commit e88e3ba
+
+> oops, -DOSX is not a good idea. [[done]] --[[Joey]] 
diff --git a/git-annex.cabal b/git-annex.cabal
index a02505c5f3..1ac97ae380 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -89,9 +89,6 @@ Executable git-annex
     Build-Depends: network-multicast, network-info
     CPP-Options: -DWITH_PAIRING
 
-  if os(darwin)
-    CPP-Options: -DOSX
-
 Test-Suite test
   Type: exitcode-stdio-1.0
   Main-Is: test.hs