X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=5b8447f6834949282e6e0d98bdd52f4116e81445;hb=8fa821cd48cdf0a265df8915e4330d3b6fb9e6a3;hp=8d6f8e1bb7400696447f7cd2083dc8416683e7c3;hpb=5b3a5c1d4f0206094e2378106d783206f7c44212;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 8d6f8e1..5b8447f 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -88,6 +88,8 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +libraryhtmldir = $(htmldir)/libraries + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -195,13 +197,10 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # the executable with the shell script on non-Windows. This should # probably be tidied up so that we can always pass the same libsubdir. ifeq "$(Windows)" "YES" -datadir = $$prefix libsubdir = $$pkgid else -datadir = $$prefix/share/ghc libsubdir = $$compiler/lib/$$pkgid endif -libraryhtmldir = $(htmldir)/libraries # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -224,7 +223,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --haddock-args="--use-contents=../index.html \ + --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \