let's not -DOSX, that results in unwanted mangling

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"

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)

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"

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]] 

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