X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=f30554eee55a30cdab57552be7033e7a2175ebb2;hb=8a95a7ebce828828aba12c1dbb7bad067e3535e9;hp=0e93ba0c00f1fe34a6eabf78b41cead749fd540c;hpb=0a148fd7108528d6cb1596b5017888c1b558220d;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 0e93ba0..f30554e 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -115,7 +115,7 @@ ilibexecdir = $(libexecdir)
 idatadir    = $(datadir)
 idocdir     = $(docdir)/libraries/$$pkgid
 ihtmldir    = $(htmldir)/libraries/$$pkgid
-html_installed_root = $(ihtmldir)
+html_installed_root = $(htmldir)/libraries
 endif
 
 ifneq "$(DOING_BIN_DIST)" "YES"
@@ -140,8 +140,8 @@ endif
 
 BOOTSTRAP_LIBS = Cabal filepath
 BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
 
 .PHONY: subdirs