From 2fe0d8ccb56589b113b8b0eb32909206038e95d7 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 1 Aug 2010 18:09:54 +0000 Subject: Make the main haddock script versioned, and make plain "haddock" a symlink --- ghc.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ghc.mk b/ghc.mk index 8ba7e11e..bc44b13d 100644 --- a/ghc.mk +++ b/ghc.mk @@ -5,6 +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_PROG = haddock$(exeext) ifneq "$(BINDIST)" "YES" @@ -39,5 +40,13 @@ install_utils/haddock_data: $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)/html"; \ done +ifeq "$(Windows)" "NO" +install: install_haddock_link +.PNONY: install_haddock_link +install_haddock_link: + "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/haddock" + $(LN_S) haddock-$(ProjectVersion) "$(DESTDIR)$(bindir)/haddock" +endif + BINDIST_EXTRAS += $(addprefix utils/haddock/,html/*) -- cgit v1.2.3