diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-19 20:32:29 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-19 20:32:29 +0000 |
| commit | 29c7945166be73aa70453d14dc2a334d16a434f2 (patch) | |
| tree | 4e6bc53009f624eb67be68d5b3ae07f1d0e73227 /utils | |
| parent | db0c34cd9e76a69b0b06b9a31065eb8e23333f3a (diff) | |
| download | haskell-29c7945166be73aa70453d14dc2a334d16a434f2.tar.gz | |
Move the PACKAGE_MAGIC evaluation inside package-data.mk
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 9cb9928f79..f189e07092 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -376,9 +376,14 @@ generate config_args distdir directory variablePrefix ++ "_DEP_LIB_DIRS = " ++ unwords (wrap $ forDeps Installed.libraryDirs), variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries), variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions), - variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi)] + variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi), + "", + -- Sometimes we need to modify the automatically-generated package-data.mk + -- bindings in a special way for the GHC build system, so allow that here: + "$(eval $(" ++ directory ++ "_PACKAGE_MAGIC))", + ] writeFile (distdir ++ "/package-data.mk") $ unlines xs - writeFile (distdir ++ "/haddock-prologue.txt") $ + writeFile (distdir ++ "/haddock-prologue.txt") $ if null (description pd) then synopsis pd else description pd where |