Commit bcd95f91 authored by Ian Lynagh's avatar Ian Lynagh

Fix ghc package in bindists; it wasn't adding the depenedency on readline

parent a214945e
......@@ -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
......
......@@ -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"
......
......@@ -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.%:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment