summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Sandberg Ericsson <adam@sandbergericsson.se>2020-12-21 09:07:44 +0100
committerAdam Sandberg Ericsson <adam@sandbergericsson.se>2020-12-23 08:23:55 +0100
commita05e7d661c0840fa6d4c179e8cc3ed075b279cf5 (patch)
tree23b6bfe7999f32a6d0871f38b8000dd337af7036
parent0b1a82db05356ac446c54c5a8c94e6e8cdb0cbe1 (diff)
downloadhaskell-a05e7d661c0840fa6d4c179e8cc3ed075b279cf5.tar.gz
mkDocs: fix extraction of Win32 docs from hadrian bindist
(cherry picked from commit 53fb345d4fb4c06f6f5450b206250eec24578d8b)
-rwxr-xr-xdistrib/mkDocs/mkDocs8
1 files changed, 6 insertions, 2 deletions
diff --git a/distrib/mkDocs/mkDocs b/distrib/mkDocs/mkDocs
index 3cbfec5695..9008a5ca9f 100755
--- a/distrib/mkDocs/mkDocs
+++ b/distrib/mkDocs/mkDocs
@@ -28,12 +28,16 @@ cd linux
make install
cd ..
[ "$NO_CLEAN" -eq 0 ] && rm -r linux
+
tar -Jxf "$WINDOWS_BINDIST"
mv ghc* windows
cd inst/share/doc/ghc*/html/libraries
-mv ../../../../../../windows/doc/html/libraries/Win32-* . || \ # make binary distribution
- mv ../../../../../../windows/docs/html/libraries/Win32 . || \ # hadrian binary distribution
+
+# try extracting the make bindist docs and then the hadrian bindist docs
+mv ../../../../../../windows/doc/html/libraries/Win32-* . || \
+ mv ../../../../../../windows/docs/html/libraries/Win32 . || \
die "failed to find the Win32 package documentation"
+
sh gen_contents_index
cd ..
for i in haddock libraries users_guide