From: sven.panne@aedion.de <unknown>
Date: Sun, 16 Sep 2007 08:43:39 +0000 (+0000)
Subject: Make DESTDIR work again
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6cc7a2957040c2d751a14c3776cf144152be4dd0

Make DESTDIR work again
installPackage is a horror, using --force is probably not the perfect way
to make DESTDIR functionality work again, but given the current state of
affairs, I can't find a quick and clean solution.

MERGE TO STABLE
---

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 475a55e..5946a6b 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -85,7 +85,7 @@ doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir
               prog = ConfiguredProgram {
                          programId = programName ghcPkgProgram,
                          programVersion = Nothing,
-                         programArgs = ["--global-conf", ghcpkgconf],
+                         programArgs = ["--force", "--global-conf", ghcpkgconf],
                          programLocation = UserSpecified ghcpkg
                      }
               progs' = updateProgram prog progs