Commit 7a51ca4f authored by Ian Lynagh's avatar Ian Lynagh

Fix installing the libraries when there is no DESTDIR

parent 5c45eb1c
......@@ -322,7 +322,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
../installPackage/installPackage $(DESTDIR) $(prefix) $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace $(DESTDIR)$(libdir)/package.conf; \
../installPackage/installPackage "$(DESTDIR)" $(prefix) $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace $(DESTDIR)$(libdir)/package.conf; \
fi
.PHONY: binary-dist binary-dist.library.%
......
......@@ -27,7 +27,8 @@ main = do args <- getArgs
doit :: FilePath -> FilePath -> FilePath -> FilePath -> Verbosity -> IO ()
doit destdir pref ghcpkg ghcpkgconf verbosity =
do let userHooks = simpleUserHooks
copyFlags = (emptyCopyFlags (CopyTo destdir)) {
copyto = if null destdir then NoCopyDest else CopyTo destdir
copyFlags = (emptyCopyFlags copyto) {
copyVerbose = verbosity
}
registerFlags = emptyRegisterFlags {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment