diff options
Diffstat (limited to 'hadrian/src/Rules')
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 3 | ||||
| -rw-r--r-- | hadrian/src/Rules/SourceDist.hs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 8709de6b26..a527664b23 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -203,11 +203,14 @@ bindistRules = do root -/- "bindist" -/- "ghc-*" -/- "configure" %> \configurePath -> do ghcRoot <- topDirectory copyFile (ghcRoot -/- "aclocal.m4") (ghcRoot -/- "distrib" -/- "aclocal.m4") + copyDirectory (ghcRoot -/- "m4") (ghcRoot -/- "distrib") buildWithCmdOptions [] $ target (vanillaContext Stage1 ghc) (Autoreconf $ ghcRoot -/- "distrib") [] [] -- We clean after ourselves, moving the configure script we generated in -- our bindist dir removeFile (ghcRoot -/- "distrib" -/- "aclocal.m4") + removeDirectory (ghcRoot -/- "distrib" -/- "m4") + moveFile (ghcRoot -/- "distrib" -/- "configure") configurePath -- Generate the Makefile that enables the "make install" part diff --git a/hadrian/src/Rules/SourceDist.hs b/hadrian/src/Rules/SourceDist.hs index 78c1539b3d..de35922ae1 100644 --- a/hadrian/src/Rules/SourceDist.hs +++ b/hadrian/src/Rules/SourceDist.hs @@ -113,7 +113,8 @@ prepareTree dest = do , "mk" , "rts" , "rules" - , "utils" ] + , "utils" + , "m4" ] srcFiles = [ "GIT_COMMIT_ID" , "HACKING.md" |