From e7d7f2df9bfd33fa5761f846d23097822c15cf26 Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Tue, 10 Feb 2004 18:38:45 +0000
Subject: [haddock @ 2004-02-10 18:38:45 by panne] Make Haddock link with the
 latest relocated monad transformer package

---
 src/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index f3534d6d..fb2b96ac 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,13 +3,20 @@ include $(TOP)/mk/boilerplate.mk
 
 INSTALLING=1
 
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_504 := $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_603 := $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
 
-# Don't use any hslibs packages in GHC >= 5.04
+SRC_HC_OPTS += -fglasgow-exts -cpp
+
+# Use hierarchical libraries for GHC >= 5.04
 ifeq "$(ghc_ge_504)" "YES"
-SRC_HC_OPTS += -package network -fglasgow-exts -cpp
+SRC_HC_OPTS += -package network
+# Monad transformers live in their own package for GHC >= 6.3
+ifeq "$(ghc_ge_603)" "YES"
+SRC_HC_OPTS += -package mtl
+endif
 else
-SRC_HC_OPTS += -package data -package text -package util -package net -fglasgow-exts -cpp
+SRC_HC_OPTS += -package data -package text -package util -package net
 endif
 
 HS_PROG = haddock.bin
-- 
cgit v1.2.3