From d829f2f95fed38a5bd16252b91327031a71ab101 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Thu, 30 Sep 2010 17:03:34 +0000
Subject: Tidy up haddock symlink installation In particular, it now doesn't
 get created if we aren't installing haddock.

---
 ghc.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ghc.mk')

diff --git a/ghc.mk b/ghc.mk
index cd420e10..96ca7f6e 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -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))
 
-- 
cgit v1.2.3