When installing, we can't rely on the ghc-pkg we just installed to work

[ghc-hetmet.git] / mk / cabal.mk

diff --git a/mk/cabal.mk b/mk/cabal.mk
index 8c486a9..efd75e2 100644 (file)
--- a/mk/cabal.mk
+++ b/mk/cabal.mk
@@ -43,10 +43,13 @@ with-stage-2:
        $(CABAL) build     --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS)
 
 install:
-       $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+       $(INSTALL_PACKAGE) install                                        \
+                          '$(GHC_PKG_INSTALL_PROG)'                      \
+                          '$(DESTDIR)$(datadir)/package.conf'            \
+                          '$(DESTDIR)' '$(prefix)'                       \
                           '$(prefix)' '$(bindir)' '$(libdir)'            \
-                       '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
-                       '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
+                          '$(libexecdir)' '$(dynlibdir)' '$(datadir)'    \
+                          '$(docdir)' '$(htmldir)' '$(haddockdir)'       \
                           --distpref dist-install                        \
                           $(INSTALL_FLAGS)