X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=0fbd4739ffc87bed816931b978be3ca32070aafe;hb=2838dd973520318e566e50f81843658749f1acb4;hp=d120a69721ce05350a1084b6e6cf6f4dbce91336;hpb=0953b80e34496dc1b229f8fe16229d3b70b7f5e3;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index d120a69..0fbd473 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -20,10 +20,13 @@ # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target +.PHONY: default_target show default_target: all +show: + @echo '$(VALUE)="$($(VALUE))"' + # make doesn't give us an easy way to get the libraries built in # dependency order the first time, but not rebuild base (for example) # when we want to rebuild another library later. @@ -88,7 +91,32 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- -libraryhtmldir = $(htmldir)/libraries +ifeq "$(RelocatableBuild)" "YES" +# On Windows we want to make moveable bindists, but we need to tell +# ghc-pkg where the haddock docs are. Therefore we completely ignore +# 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 +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 +html_installed_root = $(ihtmldir) +endif ifneq "$(DOING_BIN_DIST)" "YES" @@ -188,19 +216,8 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We explicitly set datadir to a sensible value, as Cabal (used to?) use -# "C:\\Program Files\\Common Files" -# on Windows - -# We also set libsubdir differently on Windows and non-Windows, as on -# non-Windows the path we deduce is higher up than the path passed to -# 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" -libsubdir = $$pkgid -else -libsubdir = $$compiler/lib/$$pkgid -endif +# We put non-existant paths in when configuring, as we require that +# builds don't depend on these paths when making bindists. # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -214,13 +231,16 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* $*/unbuildable ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ - --prefix='$$topdir' \ - --datadir='$(datadir)' \ - --datasubdir='$$pkgid' \ - --libsubdir='$(libsubdir)' \ - --docdir='$(libraryhtmldir)' \ - --with-compiler=../../compiler/stage1/ghc-inplace$ \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ + --prefix=/NONEXISTANT \ + --bindir=/NONEXISTANT \ + --libdir=/NONEXISTANT \ + --libsubdir='$$pkgid' \ + --libexecdir=/NONEXISTANT \ + --datadir=/NONEXISTANT \ + --docdir=/NONEXISTANT \ + --htmldir=/NONEXISTANT \ + --with-compiler=../../compiler/stage1/ghc-inplace \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ --haddock-options="--use-contents=../index.html \ @@ -230,7 +250,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try # configuring it next time round, rather than assuming it'll still fail. -# This is particularly important for corelibs, where failure means the +# This is particularly important for bootlibs, where failure means the # build dies! # Build the library using 'make' @@ -283,7 +303,10 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable $(RM) -rf installPackage - $(RM) -f libraries.txt index.html doc-index.html doc-index-*.html + $(RM) -f libraries.txt index.html doc-index.html doc-index*.html + +distclean: + $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: @@ -297,17 +320,15 @@ endif .PHONY: install install-docs install.library.% -DESTlibraryhtmldir = $(DESTDIR)$(libraryhtmldir)/html - install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(DESTlibraryhtmldir) - $(INSTALL_DATA) index.html doc-index.html $(DESTlibraryhtmldir) - $(INSTALL_SCRIPT) gen_contents_index $(DESTlibraryhtmldir) + $(INSTALL_DIR) $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) # Hacks: - $(INSTALL_DATA) $(DESTlibraryhtmldir)/base/*.css $(DESTlibraryhtmldir) - $(INSTALL_DATA) $(DESTlibraryhtmldir)/base/*.js $(DESTlibraryhtmldir) - $(INSTALL_DATA) $(DESTlibraryhtmldir)/base/*.gif $(DESTlibraryhtmldir) + $(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 @@ -317,11 +338,18 @@ install-docs: # Ideally this would depend on a stamp/build.library.%, but if it does # then we can't change the libraries and then just rerun make. # Thus if you install without building then it will just break. + +# prefix and (on Windows) htmldir use $topdir when configuring, so we +# need to tell installPackage the real path to use when installing. + +# We also need to pass all the other directories in, as they can be +# overridden when installing a bindist. + $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \ + ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -337,7 +365,7 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" cp gen_contents_index $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR) - cp doc-index.html $(BIN_DIST_LIBDIR) + cp doc-index*.html $(BIN_DIST_LIBDIR) endif cp -pR stamp $(BIN_DIST_LIBDIR)