Commit bb7c2f85 authored by sven.panne@aedion.de's avatar sven.panne@aedion.de
Browse files

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...
parent 0981e24e
...@@ -272,7 +272,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ ...@@ -272,7 +272,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable %/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \ if ifBuildable/ifBuildable $*; then \
cd $* && setup/Setup haddock; \ cd $* && setup/Setup haddock --html-location='../$$pkg'; \
fi fi
.PHONY: distclean clean clean.library.% .PHONY: distclean clean clean.library.%
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment