X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=56673df423e68f795c7923a9ffb83e368a0ed6b6;hb=33989e6eb745ca9d54ba638bc89bec7660cba4be;hp=94a9c85404aed283cdbad5895729e2d2497cf638;hpb=a91bf796d200a3b950ea30ea7a9f04ee497f39ae;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 94a9c85..56673df 100644 --- 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