aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-03-23 11:54:45 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-03-23 11:54:45 +0000
commitd01384a0eb54a96dfed2dd612fdf26001f7b0012 (patch)
tree9cf01eb9ed3bb1d4b52d780496fbf67cfcc9efa6
parent64f353b7acd018cfebd222f22b732b8516bf8649 (diff)
clean up
-rw-r--r--ghc.mk11
1 files 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