X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=libraries%2FMakefile;h=e9f90d37d753e56256cc287a5e2f723af9b75f23;hb=7b156c451f0e2fa87a1111a2ab8e4bd6d29e5a0f;hp=f30554eee55a30cdab57552be7033e7a2175ebb2;hpb=edb348c1decc87e0e13ba1a405a431f5c0658168;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index f30554e..e9f90d3 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -97,24 +97,26 @@ ifeq "$(RelocatableBuild)" "YES"
 # where the user tells us to put the haddock documentation and put it
 # somewhere whose relative location we know. When installing we need
 # to give Cabal a real path, though.
-iprefix     = $$topdir
-ibindir     = $$topdir
-ilibdir     = $$topdir
-ilibexecdir = $$topdir
-idatadir    = $$topdir
-idocdir     = $$topdir/doc/libraries/$$pkgid
-ihtmldir    = $$topdir/doc/libraries/$$pkgid
+iprefix             = $$topdir
+ibindir             = $$topdir
+ilibdir             = $$topdir
+ilibexecdir         = $$topdir
+idatadir            = $$topdir
+idocdir             = $$topdir/doc/libraries/$$pkgid
+iinterfacedir       = $$topdir/doc/libraries/$$pkgid
+ihtmldir            = $$httptopdir/doc/libraries/$$pkgid
 html_installed_root = $(prefix)/doc/libraries
 else
 # On non-Windows we can just give absolute paths all the time, and
 # thus obey the htmldir that we are given.
-iprefix     = $(prefix)
-ibindir     = $(bindir)
-ilibdir     = $(libdir)
-ilibexecdir = $(libexecdir)
-idatadir    = $(datadir)
-idocdir     = $(docdir)/libraries/$$pkgid
-ihtmldir    = $(htmldir)/libraries/$$pkgid
+iprefix             = $(prefix)
+ibindir             = $(bindir)
+ilibdir             = $(libdir)
+ilibexecdir         = $(libexecdir)
+idatadir            = $(datadir)
+idocdir             = $(docdir)/libraries/$$pkgid
+iinterfacedir       = $(htmldir)/libraries/$$pkgid
+ihtmldir            = $(htmldir)/libraries/$$pkgid
 html_installed_root = $(htmldir)/libraries
 endif
 
@@ -238,6 +240,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	           --libexecdir=/NONEXISTANT \
 	           --datadir=/NONEXISTANT \
 	           --docdir=/NONEXISTANT \
+			   --interfacedir=/NONEXISTANT \
 	           --htmldir=/NONEXISTANT \
 	           --with-compiler=../../compiler/stage1/ghc-inplace \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
@@ -285,7 +288,7 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 .PHONY: doc
 
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
-	sh gen_contents_index
+	sh gen_contents_index --inplace
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@ -304,6 +307,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -rf ifBuildable
 	$(RM) -rf installPackage
 	$(RM) -f libraries.txt index.html doc-index.html doc-index*.html
+	$(RM) -f haddock* *.gif
 
 distclean:
 	$(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
@@ -326,9 +330,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)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -349,7 +353,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \
+	  ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -368,6 +372,10 @@ ifeq "$(HADDOCK_DOCS)" "YES"
 	cp    doc-index*.html               $(BIN_DIST_LIBDIR)
 endif
 	cp -pR stamp                         $(BIN_DIST_LIBDIR)
+	# This gets used in the compiler directory to see if GHC should
+	# depend on the readline package or not
+	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline
+	cp    readline/config.mk            $(BIN_DIST_LIBDIR)/readline
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
@@ -377,6 +385,7 @@ binary-dist.library.%:
 	  cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
 	  cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
 	  cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
+	  $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
 	  (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
 	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
 	     \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \