X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=89f10f8380705822860218cbfd6db5d3a1ffee29;hb=8fd85c9d692f91a5b565bb0d54050c2ce6ac6ae2;hp=d9cc69a13e1a8f51fec49bf2b92229741c4d5a37;hpb=02924d52507ab58a05b3cb412a505e4cec86c413;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index d9cc69a..89f10f8 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -102,8 +102,8 @@ ibindir     = $$topdir
 ilibdir     = $$topdir
 ilibexecdir = $$topdir
 idatadir    = $$topdir
-idocdir     = $$topdir/doc/libraries/$$pkg
-ihtmldir    = $$topdir/doc/libraries/$$pkg
+idocdir     = $$topdir/doc/libraries/$$pkgid
+ihtmldir    = $$topdir/doc/libraries/$$pkgid
 html_installed_root = $(prefix)/doc/libraries
 else
 # On non-Windows we can just give absolute paths all the time, and
@@ -113,9 +113,9 @@ ibindir     = $(bindir)
 ilibdir     = $(libdir)
 ilibexecdir = $(libexecdir)
 idatadir    = $(datadir)
-idocdir     = $(docdir)/libraries/$$pkg
-ihtmldir    = $(htmldir)/libraries/$$pkg
-html_installed_root = $(ihtmldir)
+idocdir     = $(docdir)/libraries/$$pkgid
+ihtmldir    = $(htmldir)/libraries/$$pkgid
+html_installed_root = $(htmldir)/libraries
 endif
 
 ifneq "$(DOING_BIN_DIST)" "YES"
@@ -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.%