diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-03 13:52:03 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-07 14:06:16 -0500 |
| commit | 5b35ca58d94d07751ef2f810686f588ce9c0878a (patch) | |
| tree | a9445b8802aed1cd46548cae5d3d33176dccd5fe /hadrian | |
| parent | 7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b (diff) | |
| download | haskell-5b35ca58d94d07751ef2f810686f588ce9c0878a.tar.gz | |
Fix gen_contents_index logic for hadrian bindist
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/bindist/Makefile | 3 | ||||
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index 3ae599452f..fdeb06ace5 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -190,6 +190,9 @@ install_docs: cp -R $$i "$(docdir)/"; \ done + $(INSTALL_DATA) docs-utils/prologue.txt "$(docdir)/html/libraries/" + $(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(docdir)/html/libraries/" + BINARY_NAMES=$(shell ls ./wrappers/) install_wrappers: install_bin_libdir @echo "Installing wrapper scripts" diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index a6693a75f3..f07c455e38 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -227,6 +227,9 @@ bindistRules = do -- included in the bindist in the past (part of the problem in #18669). whenM (liftIO (IO.doesDirectoryExist (root -/- "docs"))) $ do copyDirectory (root -/- "docs") bindistFilesDir + copyFile ("libraries" -/- "prologue.txt") (bindistFilesDir -/- "docs-utils" -/- "prologue.txt") + copyFile ("libraries" -/- "gen_contents_index") (bindistFilesDir -/- "docs-utils" -/- "gen_contents_index" ) + when windowsHost $ do copyDirectory (root -/- "mingw") bindistFilesDir -- we use that opportunity to delete the .stamp file that we use |