diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-09-14 13:26:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-09-14 13:26:58 +0000 |
| commit | e05f9de137269701df667b69d741dfae616694f7 (patch) | |
| tree | 96869c0174c1f79f638d231919dd0cffe4060276 /mk | |
| parent | a28ba79a751ec22728e9bdf4184524d72b038339 (diff) | |
| download | haskell-e05f9de137269701df667b69d741dfae616694f7.tar.gz | |
Refer to "boot" libs, not "core" libs
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 8 | ||||
| -rw-r--r-- | mk/package.mk | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index ea2f5d6dee..640f33e45b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -396,13 +396,7 @@ StripLibraries=NO # These are the URL patterns that Haddock uses to generate the "Source # File" links on each page. -CorePackageSourceURL = http://darcs.haskell.org/ghc-6.6/packages/$(PACKAGE)/%{FILE} -ExtraPackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE} - -# These are the packages required to be present in order to bootstrap GHC -# NB. must be synced with libraries/core-packages -CorePackages = base Cabal haskell98 readline regex-base regex-compat \ - regex-posix parsec stm template-haskell unix Win32 +PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE} # ---------------------------------------------------------------------------- # Object-file splitting diff --git a/mk/package.mk b/mk/package.mk index 78c01f285e..094b6a5748 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -279,19 +279,13 @@ html :: $(HTML_DOC) extraclean :: $(RM) -rf $(HTML_DIR) -ifneq "$(findstring $(PACKAGE), $(CorePackages))" "" -HaddockSourceURL = $(CorePackageSourceURL) -else -HaddockSourceURL = $(ExtraPackageSourceURL) -endif - $(HTML_DOC) : $(HS_PPS) @$(INSTALL_DIR) $(HTML_DIR) $(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \ --package=$(PACKAGE) \ --dump-interface=$(PACKAGE).haddock \ --use-index=../doc-index.html --use-contents=../index.html \ - --source-module=$(HaddockSourceURL) \ + --source-module=$(PackageSourceURL) \ $(foreach pkg, $(PACKAGE_DEPS), \ --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock) |