# -----------------------------------------------------------------------------
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
# "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 rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
--prefix='$$topdir' \
--bindir='$(bindir)' \
--libdir='$(libdir)' \
- --libsubdir='$(libsubdir)' \
+ --libsubdir='$$pkgid' \
--libexecdir='$(libexecdir)' \
--datadir='$(datadir)' \
--docdir='$(docdir)' \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
- ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \
+ ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(htmldir_configure)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \
fi
.PHONY: binary-dist binary-dist.library.%