From bcd95f911539fd5308bec5a025bcadba712a3830 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 24 Oct 2007 12:06:33 +0000 Subject: [PATCH] Fix ghc package in bindists; it wasn't adding the depenedency on readline --- Makefile | 1 + compiler/Makefile | 2 +- libraries/Makefile | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e195f88..000bfa0 100644 --- a/Makefile +++ b/Makefile @@ -330,6 +330,7 @@ binary-dist:: echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE) echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE) echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE) + echo "TARGETPLATFORM = $(TARGETPLATFORM)" >> $(VARFILE) cat distrib/Makefile-bin-vars.in >> $(VARFILE) @echo "Generating a shippable configure script.." $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac diff --git a/compiler/Makefile b/compiler/Makefile index 209765e..b07f777 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -493,7 +493,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE PKG_DEPENDS += readline endif else --include $(FPTOOLS_TOP)/libraries/readline/config.mk +-include $(FPTOOLS_TOP_ABS)/libraries/readline/config.mk # readline's config.mk sets PACKAGE, which we don't want here PACKAGE= ifeq "$(READLINE_BUILD_PACKAGE)" "yes" diff --git a/libraries/Makefile b/libraries/Makefile index f30554e..12f7970 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -368,6 +368,10 @@ ifeq "$(HADDOCK_DOCS)" "YES" cp doc-index*.html $(BIN_DIST_LIBDIR) endif cp -pR stamp $(BIN_DIST_LIBDIR) + # This gets used in the compiler directory to see if GHC should + # depend on the readline package or not + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline + cp readline/config.mk $(BIN_DIST_LIBDIR)/readline $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: -- 1.7.10.4