# -----------------------------------------------------------------------------
-docdir := $(docdir)/libraries/$$pkgid
-ifeq "$(Windows)" "YES"
+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.
-htmldir_configure = $$topdir/doc/libraries/$$pkgid
-htmldir_install = $(prefix)/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.
-htmldir_configure = $(htmldir)/libraries/$$pkgid
-htmldir_install = $(htmldir_configure)
+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
ifneq "$(DOING_BIN_DIST)" "YES"
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
# 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.
-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
( cd $* && setup/Setup configure \
$(CONFIGURE_OPTS) \
- --prefix='$$topdir' \
- --docdir='$(docdir)' \
- --htmldir='$(htmldir_configure)' \
- --datadir='$(datadir)' \
- --libsubdir='$(libsubdir)' \
- --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 \
+ --interfacedir=/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 \
&& 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'
.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).% \
%/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.%
$(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
+ $(RM) -f haddock* *.gif
+
+distclean:
+ $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
clean.library.%:
install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
ifeq "$(HADDOCK_DOCS)" "YES"
- $(INSTALL_DIR) $(DESTDIR)$(htmldir_install)
- $(INSTALL_DATA) index.html doc-index.html $(DESTDIR)$(htmldir_install)
- $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install)
+ $(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) $(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)
+ $(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
# 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)' '$(htmldir_install)' '$(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)' '$(iinterfacedir)' ; \
fi
.PHONY: binary-dist binary-dist.library.%
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)
+ # 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.%:
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 && \
projects / ghc-hetmet.git / blobdiff