X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=e67466a1eca674080b4c67b1c80b5272448095ed;hp=0f237bc10ef305dae31a8e515248b2e4269b84cf;hb=bd2a36fc0a209c119e9451376b18e3c9b199d4f5;hpb=21afd63e4f61184acfc7e196f123861fa591df59 diff --git a/libraries/Makefile b/libraries/Makefile index 0f237bc..e67466a 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,6 +91,22 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +docdir := $(docdir)/libraries/$$pkgid +ifeq "$(Windows)" "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. +htmldir_configure = $$topdir/doc/libraries/$$pkgid +htmldir_install = $(prefix)/doc/libraries/$$pkgid +else +# On non-Windows we can just give absolute paths all the time, and +# thus obey the htmldir that we are given. +htmldir_configure = $(htmldir)/libraries/$$pkgid +htmldir_install = $(htmldir_configure) +endif + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -186,24 +205,19 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We explicitly set datadir to "$prefix/share" as, while that is the -# default on Linux, on Windows it defaults to -# "C:\\Program Files\\Common Files" +# 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 highre up than the path passed to +# 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" -DATA_REL_DIR = . -datadir = $$prefix -libsubdir = $$pkgid +libsubdir = $$pkgid else -DATA_REL_DIR = share/ghc -datadir = $$prefix/share/ghc -libsubdir = $$compiler/lib/$$pkgid +libsubdir = $$compiler/lib/$$pkgid endif -DOC_ROOT = $(prefix)/$(DATA_REL_DIR)/doc/html/ # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -218,14 +232,15 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ + --docdir='$(docdir)' \ + --htmldir='$(htmldir_configure)' \ --datadir='$(datadir)' \ - --datasubdir='.' \ --libsubdir='$(libsubdir)' \ --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-args="--use-contents=../index.html \ + --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ @@ -266,8 +281,6 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ .PHONY: doc -DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) - doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) sh gen_contents_index @@ -275,7 +288,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; \ + cd $* && setup/Setup haddock --html-location='../$$pkg'; \ fi .PHONY: distclean clean clean.library.% @@ -287,7 +300,7 @@ 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 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: @@ -303,13 +316,13 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(DOC_ROOT) - $(INSTALL_DATA) index.html doc-index.html $(DOC_ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(DOC_ROOT) + $(INSTALL_DIR) $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(htmldir_install) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) # Hacks: - $(INSTALL_DATA) $(DOC_ROOT)/base/*.css $(DOC_ROOT) - $(INSTALL_DATA) $(DOC_ROOT)/base/*.js $(DOC_ROOT) - $(INSTALL_DATA) $(DOC_ROOT)/base/*.gif $(DOC_ROOT) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.js $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.gif $(DESTDIR)$(htmldir_install) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -319,11 +332,15 @@ 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. + $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \ + ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(htmldir_install)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -336,20 +353,22 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) mkdir $(BIN_DIST_LIBDIR)/ifBuildable cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable cp Makefile $(BIN_DIST_LIBDIR) +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 -a stamp $(BIN_DIST_LIBDIR) + cp doc-index*.html $(BIN_DIST_LIBDIR) +endif + cp -pR stamp $(BIN_DIST_LIBDIR) $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* if ifBuildable/ifBuildable $*; then \ + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ cd $* && \ cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ - cp -a dist $(BIN_DIST_LIBDIR)/$* && \ - (cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \ + cp -R dist $(BIN_DIST_LIBDIR)/$* && \ + (cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \