diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-09-30 17:03:34 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-09-30 17:03:34 +0000 |
| commit | d829f2f95fed38a5bd16252b91327031a71ab101 (patch) | |
| tree | 0c6a9e1805b2c9fd612ce9c37a12d23d248570db | |
| parent | 7faa71bc7b3c47bba45683a20075dc49b76a05b4 (diff) | |
Tidy up haddock symlink installation
In particular, it now doesn't get created if we aren't installing
haddock.
| -rw-r--r-- | ghc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -33,6 +33,9 @@ utils/haddock_dist_MODULES += Paths_haddock ifeq "$(HADDOCK_DOCS)" "YES" install: install_utils/haddock_html install: install_utils/haddock_data +ifeq "$(Windows)" "NO" +install: install_utils/haddock_link +endif endif .PHONY: install_utils/haddock_html @@ -47,13 +50,10 @@ install_utils/haddock_data: $(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 -.PNONY: install_haddock_link -install_haddock_link: +.PHONY: install_utils/haddock_link +install_utils/haddock_link: "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/haddock" $(LN_S) haddock-$(ProjectVersion) "$(DESTDIR)$(bindir)/haddock" -endif BINDIST_EXTRAS += $(addprefix utils/haddock/,$(utils/haddock_dist_DATA_FILES)) |