diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-08-18 18:57:24 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-08-18 18:57:24 +0000 |
| commit | 9e369a2a812962ddd96572c251da73ae9f98b95c (patch) | |
| tree | ec34ecfa2fcfeb98a496709599447b21a57979d4 | |
| parent | 2fe0d8ccb56589b113b8b0eb32909206038e95d7 (diff) | |
Fix installation in the GHC build system
Data-files are now in subdirectories, so we need to handle that
| -rw-r--r-- | ghc.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -35,10 +35,10 @@ install_utils/haddock_html: install: install_utils/haddock_data .PHONY: install_utils/haddock_data install_utils/haddock_data: - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/html" - for i in utils/haddock/html/*; do \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)/html"; \ - done + $(foreach i,$(sort $(dir $(utils/haddock_dist_DATA_FILES))), \ + $(call make-command,$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/$i")) + $(foreach i,$(utils/haddock_dist_DATA_FILES), \ + $(call make-command,$(INSTALL_DATA) $(INSTALL_OPTS) utils/haddock/$i "$(DESTDIR)$(ghclibdir)/$(dir $i)")) ifeq "$(Windows)" "NO" install: install_haddock_link |