aboutsummaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorSimon Hengel <sol@typeful.net>2012-10-15 11:38:42 +0200
committerSimon Hengel <sol@typeful.net>2012-10-15 14:54:19 +0200
commit943c5b7880cbfa8c90a0776dd539ae1e89f46d35 (patch)
tree06403dcb6ca44f74450d2d0be4778ea3a036b57a /ghc.mk
parent89b52831f24e6ad94b2d763e704119829e1ddc6c (diff)
Move resources to /resources directory
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/ghc.mk b/ghc.mk
index 3742565c..3af63818 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -13,11 +13,11 @@ $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html $(INPLACE_LIB)/la
$(INPLACE_LIB)/html:
$(call removeTrees,$@)
- "$(CP)" -R utils/haddock/html $@
+ "$(CP)" -R utils/haddock/resources/html $@
$(INPLACE_LIB)/latex:
$(call removeTrees,$@)
- "$(CP)" -R utils/haddock/latex $@
+ "$(CP)" -R utils/haddock/resources/latex $@
endif
@@ -41,12 +41,12 @@ 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/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)")))
+ $(call make-command,$(call INSTALL_DATA,$(INSTALL_OPTS),utils/haddock/resources/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)")))
.PHONY: install_utils/haddock_link
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/,$(utils/haddock_dist_DATA_FILES))
+BINDIST_EXTRAS += $(addprefix utils/haddock/resources/,$(utils/haddock_dist_DATA_FILES))