diff options
author | Ian Lynagh <igloo@earth.li> | 2009-03-29 15:31:43 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2009-03-29 15:31:43 +0000 |
commit | c8b226232b529d2543f72dbcd1984d669bba9e8b (patch) | |
tree | 8f8fd4b4d207e4c61eebc6fd4df3108a29781def | |
parent | 611a30585cb6ee482bfd0eeb2c0feb9e678325fd (diff) |
GHC new build system fixes
-rw-r--r-- | ghc.mk | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -8,18 +8,25 @@ utils/haddock_dist_SHELL_WRAPPER = YES utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES utils/haddock_dist_PROG = haddock$(exeext) +ifneq "$(BINDIST)" "YES" + $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html $(INPLACE_LIB)/html: $(RM) -rf $@ $(CP) -R utils/haddock/html $@ +$(eval $(call build-prog,utils/haddock,dist,2)) + +utils/haddock_dist_MODULES += Paths_haddock + +endif + install: install_utils/haddock_html .PHONY: install_utils/haddock_html install_utils/haddock_html: $(RM) -rf $(DESTDIR)$(datadir)/html $(CP) -R utils/haddock/html $(DESTDIR)$(datadir)/html -$(eval $(call build-prog,utils/haddock,dist,2)) +$(eval $(call bindist,utils/haddock,ghc.mk html/*)) -utils/haddock_dist_MODULES += Paths_haddock |