[commit: haddock] master: GHC build system: Don't install the datafiles twice (ab2581e)

Ian Lynagh igloo at earth.li
Thu Jul 28 18:19:56 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ab2581e0298f95307c3163ed790ab08a536447ee

>---------------------------------------------------------------

commit ab2581e0298f95307c3163ed790ab08a536447ee
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jul 28 16:39:45 2011 +0100

    GHC build system: Don't install the datafiles twice

>---------------------------------------------------------------

 ghc.mk |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 158baee..7e9bfc8 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -31,18 +31,12 @@ $(eval $(call build-prog,utils/haddock,dist,2))
 utils/haddock_dist_MODULES += Paths_haddock
 
 ifeq "$(HADDOCK_DOCS)" "YES"
-install: install_utils/haddock_html
 install: install_utils/haddock_data
 ifeq "$(Windows)" "NO"
 install: install_utils/haddock_link
 endif
 endif
 
-.PHONY: install_utils/haddock_html
-install_utils/haddock_html:
-	$(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
-	"$(CP)" -R utils/haddock/html "$(DESTDIR)$(docdir)/html"
-
 .PHONY: install_utils/haddock_data
 install_utils/haddock_data:
 	$(foreach i,$(sort $(dir $(utils/haddock_dist_DATA_FILES))), \





More information about the Cvs-ghc mailing list