X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal.mk;h=3d525d77390643533c5a797f7de0d0fcddb0995e;hb=c4ec8f2a77894af1c6160c4e8ad5625ab62f0bea;hp=8c486a982e1f476cb8e59aa58dc97d9399e63be2;hpb=4a73af53332e94ca56a6faed96f8391c14ecfa18;p=ghc-hetmet.git

diff --git a/mk/cabal.mk b/mk/cabal.mk
index 8c486a9..3d525d7 100644
--- a/mk/cabal.mk
+++ b/mk/cabal.mk
@@ -43,16 +43,20 @@ 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)
 
 clean:
 	-$(CABAL) clean --distpref dist-inplace
 	-$(CABAL) clean --distpref dist-install
+	$(RM) -rf install-inplace
 ifneq "$(EXTRA_CLEAN)" ""
 	$(RM) -f $(EXTRA_CLEAN)
 endif