From d01384a0eb54a96dfed2dd612fdf26001f7b0012 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 23 Mar 2009 11:54:45 +0000 Subject: clean up --- ghc.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ghc.mk b/ghc.mk index db046b54..bc221de1 100644 --- a/ghc.mk +++ b/ghc.mk @@ -5,17 +5,14 @@ utils/haddock_CONFIGURE_OPTS = --flag in-ghc-tree # XXX This is a temporary hack: utils/haddock_HC_OPTS += -Wwarn utils/haddock_dist_SHELL_WRAPPER = YES +utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES utils/haddock_dist_PROG = haddock -# XXX Is this a hack? Should it be needed? Done another way? -utils/haddock_dist_DATADIR = lib -$(INPLACE_BIN)/$(utils/haddock_dist_PROG): inplace/lib/html +$(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html -inplace/lib/html: +$(INPLACE_LIB)/html: $(RM) -rf $@ - cp -a utils/haddock/html $@ - -INSTALL_LIBEXECS += utils/haddock/dist/build/$(utils/haddock_dist_PROG) + $(CP) -R utils/haddock/html $@ install: install_utils/haddock_html .PHONY: install_utils/haddock_html -- cgit v1.2.3