From 3bb58afd594c7208a34749202a858644498acb6f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 10 Jun 2012 12:03:11 +0300 Subject: [PATCH] Makefile: ignore monads-tf in favour of mtl Fixes build breakage when both 'mtl' and 'monads-tf' are present: $ make git-annex > ghc -O2 -Wall -ignore-package monads-fd -outputdir tmp -IUtility -DWITH_S3 --make git-annex Utility/libdiskfree.o > > Common.hs:6:8: > Ambiguous module name `Control.Monad.State.Strict': > it was found in multiple packages: monads-tf-0.1.0.0 mtl-2.1.1 > make: *** [git-annex] Error 1 Signed-off-by: Sergei Trofimovich --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94dc05a819..2d8146c857 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PREFIX=/usr -IGNORE=-ignore-package monads-fd +IGNORE=-ignore-package monads-fd -ignore-package monads-tf BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 GHCFLAGS=-O2 $(BASEFLAGS)