From a214945eb3e24976f6e41ffe666eec69358d9ce7 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 24 Oct 2007 11:42:19 +0000 Subject: [PATCH] Fix installing the ghc package .hi files in a bindist --- compiler/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index be09d35..209765e 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -864,8 +864,14 @@ GhcLibWays = $(GhcCompilerWays) # override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence GhcLibHcOpts = +ifeq "$(DOING_BIN_DIST)" "YES" +# This is derived from the sources when we are in a source tree, but we +# don't have any sources in a bindist, so we have to shortcut it +HS_IFACES := $(wildcard stage$(stage)/*/*.hi) +else # override default definition of HS_IFACES so we can add $(odir) HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) +endif # Haddock can't handle recursive modules currently, so we disable it for now. override HADDOCK_DOCS = NO @@ -940,12 +946,6 @@ endif #----------------------------------------------------------------------------- # binary-dist -ifeq "$(DOING_BIN_DIST)" "YES" -# This is derived from the sources when we are in a source tree, but we -# don't have any sources in a bindist, so we have to shortcut it -HS_IFACES := $(wildcard stage$(stage)/*/*.hi) -endif - binary-dist: $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage) -- 1.7.10.4