do a better job of ignoring unrecognised pragmas

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index 94a9c85..56673df 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -438,7 +438,10 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
 else
-ifeq "$(GhcLibsWithReadline)" "YES"
+-include $(FPTOOLS_TOP)/libraries/readline/config.mk
+# readline's config.mk sets PACKAGE, which we don't want here
+PACKAGE=
+ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
 SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif