[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Fixup ghc.mk (follow-up to 1739375eb23342) (179a3fa)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/179a3faca1524f6cb1cd21e0cefc2000bb6480be

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

commit 179a3faca1524f6cb1cd21e0cefc2000bb6480be
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 14 18:26:50 2014 +0100

    Fixup ghc.mk (follow-up to 1739375eb23342)
    
    This makes the GHC build-system aware of the data-files to be copied
    into the bindist (as haddock.cabal doesn't list those anymore)


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

179a3faca1524f6cb1cd21e0cefc2000bb6480be
 ghc.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index e8bf736..a3bb834 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -36,6 +36,19 @@ endif
 
 utils/haddock_dist_MODULES += Paths_haddock
 
+utils/haddock_dist_DATA_FILES += html/frames.html
+utils/haddock_dist_DATA_FILES += html/haddock-util.js
+utils/haddock_dist_DATA_FILES += html/Classic.theme/haskell_icon.gif
+utils/haddock_dist_DATA_FILES += html/Classic.theme/minus.gif
+utils/haddock_dist_DATA_FILES += html/Classic.theme/plus.gif
+utils/haddock_dist_DATA_FILES += html/Classic.theme/xhaddock.css
+utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/hslogo-16.png
+utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/minus.gif
+utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/ocean.css
+utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/plus.gif
+utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/synopsis.png
+utils/haddock_dist_DATA_FILES += latex/haddock.sty
+
 ifeq "$(HADDOCK_DOCS)" "YES"
 install: install_utils/haddock_data
 ifeq "$(Windows_Host)" "NO"
@@ -55,4 +68,4 @@ install_utils/haddock_link:
 	$(call removeFiles,"$(DESTDIR)$(bindir)/haddock")
 	$(LN_S) $(utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME) "$(DESTDIR)$(bindir)/haddock"
 
-BINDIST_EXTRAS += $(addprefix utils/haddock/resources/,$(utils/haddock_dist_DATA_FILES))
+BINDIST_EXTRAS += $(addprefix utils/haddock/haddock-api/resources/,$(utils/haddock_dist_DATA_FILES))