aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-07 23:06:57 +0000
committerIan Lynagh <igloo@earth.li>2011-01-07 23:06:57 +0000
commit89d75630b334906e556f4de253c1cefa7819090d (patch)
tree704e50a24625a12cb0eee589a69e9b491772e589
parentb751e9097ab418cce9aeb77eed73035d0adcafc6 (diff)
Name the haddock script haddock-ghc-7.0.2 instead of haddock-7.0.2; #4882
"7.0.2" looked like a haddock version number before
-rw-r--r--ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc.mk b/ghc.mk
index 2183dfa2..158baeef 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -5,7 +5,7 @@ utils/haddock_CONFIGURE_OPTS = --flag in-ghc-tree
utils/haddock_HC_OPTS += -DNEW_GHC_LAYOUT
utils/haddock_dist_SHELL_WRAPPER = YES
utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES
-utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME = haddock-$(ProjectVersion)
+utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME = haddock-ghc-$(ProjectVersion)
utils/haddock_dist_PROG = haddock$(exeext)
ifneq "$(BINDIST)" "YES"
@@ -53,7 +53,7 @@ install_utils/haddock_data:
.PHONY: install_utils/haddock_link
install_utils/haddock_link:
"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/haddock"
- $(LN_S) haddock-$(ProjectVersion) "$(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))