@@ -9,16 +9,14 @@ import Distribution.Simple import Distribution.Simple.Configure import Distribution.Simple.LocalBuildInfo import Distribution.Simple.Program -import Distribution.Simple.Utils (defaultPackageDesc) +import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic) import Distribution.Simple.Build (writeAutogenFiles) -import Distribution.Simple.Register (writeInstalledConfig) +import Distribution.Simple.Register import Distribution.Simple.PackageIndex import Distribution.Text import Distribution.Verbosity import qualified Distribution.InstalledPackageInfo as Installed - ( InstalledPackageInfo_(..) ) import qualified Distribution.Simple.PackageIndex as PackageIndex - ( topologicalOrder, lookupPackageName, insert ) import Control.Monad import Data.Maybe @@ -182,9 +180,15 @@ generate config_args distdir directory writeAutogenFiles verbosity pd lbi -- generate inplace-pkg-config - when (isJust $ library pd) $ - writeInstalledConfig distdir pd lbi True - (distdir </> "inplace-pkg-config") + case (library pd, libraryConfig lbi) of + (Nothing, Nothing) -> return () + (Just lib, Just clbi) -> do + cwd <- getCurrentDirectory + let installedPkgInfo = inplaceInstalledPackageInfo cwd distdir + pd lib lbi clbi + content = Installed.showInstalledPackageInfo installedPkgInfo ++ "\n" + writeFileAtomic (distdir </> "inplace-pkg-config") content + _ -> error "Inconsistent lib components; can't happen?" let libBiModules lib = (libBuildInfo lib, libModules lib) utils/ghc-cabal/ghc-cabal.hs e67eafc2ad296267cec5e8feb93f3ab89dc3cd1d Ian Lynagh igloo@earth.li http://github.com/ghc-hq/ghc/commit/77458f4fc5f3e9f4be12cee7dd4655b86d9974e4 77458f4fc5f3e9f4be12cee7dd4655b86d9974e4 2009-07-05T11:04:14-07:00 2009-07-05T11:04:14-07:00 Follow Cabal changes 55e575332e8bb7eee7d6c4cefb3a553a7967d645 Ian Lynagh igloo@earth.li