From: panne <unknown>
Date: Sun, 21 Nov 2004 12:13:23 +0000 (+0000)
Subject: [project @ 2004-11-21 12:13:23 by panne]
X-Git-Tag: Initial_conversion_from_CVS_complete~1411
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=60f2f165f05ff4a6bef9bc73dc243ab8150826fc

[project @ 2004-11-21 12:13:23 by panne]
Fixed include paths. Thinking about the convoluted dependencies between ghc,
ghc-pkg and libraries really makes me dizzy... Some cleanup and simplification
is needed here *urgently*, this stuff is currently beyond my grasp.
---

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index d4b3d14..cda1fbb 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -11,8 +11,9 @@ INSTALLING=1
 
 ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
 
-SRC_HC_OPTS      += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
+SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
+SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
 SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
 SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat