From 515d25112735fda7802809525e8714ae250756d6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Apr 2014 10:57:01 -0400
Subject: [PATCH] better approach for building distributionupdate

Use cabal include file
---
 Makefile       | 2 +-
 Utility/URI.hs | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5c474e9ca1..cbc369572a 100644
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ hdevtools:
 distributionupdate:
 	git pull
 	cabal configure
-	ghc --make Build/DistributionUpdate -XPackageImports
+	ghc --make Build/DistributionUpdate -XPackageImports -optP-include -optPdist/build/autogen/cabal_macros.h
 	./Build/DistributionUpdate
 
 .PHONY: git-annex git-union-merge git-recover-repository tags build-stamp
diff --git a/Utility/URI.hs b/Utility/URI.hs
index 2401596093..39c2f2289e 100644
--- a/Utility/URI.hs
+++ b/Utility/URI.hs
@@ -10,11 +10,9 @@
 module Utility.URI where
 
 -- Old versions of network lacked an Ord for URI
-#ifdef VERSION_network
 #if ! MIN_VERSION_network(2,4,0)
 import Network.URI
 
 instance Ord URI where
 	a `compare` b = show a `compare` show b
 #endif
-#endif