summaryrefslogtreecommitdiff
path: root/libraries/Makefile
diff options
context:
space:
mode:
authorsven.panne@aedion.de <unknown>2007-09-04 17:28:55 +0000
committersven.panne@aedion.de <unknown>2007-09-04 17:28:55 +0000
commitbb7c2f853c3dd4004cd738b18e8d63ce6301aa61 (patch)
tree747d4fbd6accd07c689c3cfbba18b9751408e78e /libraries/Makefile
parent0981e24e9980b8b26e6f20fc56bebc1c7416cc4f (diff)
downloadhaskell-bb7c2f853c3dd4004cd738b18e8d63ce6301aa61.tar.gz
Don't hardwire the build path into the Haddock docs
Formerly, the ghc-pkg was called to get the HTML dirs for other packages, but of course doing this at *build* time is totally wrong. Now we use a relative path, just like before. This is probably not perfect, but much better than before. As a sidenote: Cabal calls the relevant flag "html-location", ghc-pkg calls the field "haddock-html", and Haddock itself uses it as part of "read-interface". Too much creativity is sometimes a bad thing...
Diffstat (limited to 'libraries/Makefile')
-rw-r--r--libraries/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/Makefile b/libraries/Makefile
index 1b6546b758..b78eb8c8e9 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -272,7 +272,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
- cd $* && setup/Setup haddock; \
+ cd $* && setup/Setup haddock --html-location='../$$pkg'; \
fi
.PHONY: distclean clean clean.library.%