X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=f30554eee55a30cdab57552be7033e7a2175ebb2;hb=e33b257ee0706bcf08fa7eba56c17fbd2dd223a5;hp=0fbd4739ffc87bed816931b978be3ca32070aafe;hpb=6b2adb8d5052aa2a5dd4000beacc1f3b402257a6;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 0fbd473..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
 
@@ -291,7 +291,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 --html-location='../$$pkg'; \
+	  cd $* && setup/Setup haddock --html-location='../$$pkgid'; \
 	fi
 
 .PHONY: distclean clean clean.library.%
@@ -326,9 +326,9 @@ ifeq "$(HADDOCK_DOCS)" "YES"
 	$(INSTALL_DATA)   index.html doc-index*.html                       $(DESTDIR)$(html_installed_root)
 	$(INSTALL_SCRIPT) gen_contents_index                               $(DESTDIR)$(html_installed_root)
 	# Hacks:
-	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base-*/*.css $(DESTDIR)$(html_installed_root)
-	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base-*/*.js  $(DESTDIR)$(html_installed_root)
-	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base-*/*.gif $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.css $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.js  $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.gif $(DESTDIR)$(html_installed_root)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here