From 179a3faca1524f6cb1cd21e0cefc2000bb6480be Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sun, 14 Dec 2014 18:26:50 +0100 Subject: 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) --- ghc.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc.mk b/ghc.mk index e8bf7360..a3bb834f 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)) -- cgit v1.2.3