diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-12-12 07:48:42 +0000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-12-12 12:27:13 +0000 |
| commit | 1739375eb23342618a3ac01c46a9e4a48cabf716 (patch) | |
| tree | ed98bea17204067674621be802dabe639b74ac83 /ghc.mk | |
| parent | 3fd4c8c0b1be302d209e580d7190aef7c923a2ee (diff) | |
Various fixups and bumps for next release
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -26,11 +26,11 @@ $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html $(INPLACE_LIB)/la $(INPLACE_LIB)/html: $(call removeTrees,$@) - "$(CP)" -RL utils/haddock/resources/html $@ + "$(CP)" -RL utils/haddock/haddock-api/resources/html $@ $(INPLACE_LIB)/latex: $(call removeTrees,$@) - "$(CP)" -RL utils/haddock/resources/latex $@ + "$(CP)" -RL utils/haddock/haddock-api/resources/latex $@ endif @@ -48,7 +48,7 @@ install_utils/haddock_data: $(foreach i,$(sort $(dir $(utils/haddock_dist_DATA_FILES))), \ $(call make-command,$(call INSTALL_DIR,"$(DESTDIR)$(ghclibdir)/$i"))) $(foreach i,$(utils/haddock_dist_DATA_FILES), \ - $(call make-command,$(call INSTALL_DATA,$(INSTALL_OPTS),utils/haddock/resources/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)"))) + $(call make-command,$(call INSTALL_DATA,$(INSTALL_OPTS),utils/haddock/haddock-api/resources/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)"))) .PHONY: install_utils/haddock_link install_utils/haddock_link: @@ -56,4 +56,3 @@ install_utils/haddock_link: $(LN_S) $(utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME) "$(DESTDIR)$(bindir)/haddock" BINDIST_EXTRAS += $(addprefix utils/haddock/resources/,$(utils/haddock_dist_DATA_FILES)) - |