bindist fixes

diff --git a/compiler/Makefile b/compiler/Makefile
index 0c3dcd5..8dced37 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -451,6 +451,14 @@ install-docs:
 # binary-dist
 #
 
+# Ideally we'd get these from the Cabal file's Install-Includes:
+BINDIST_EXTRAS += HsVersions.h
+ifeq "$(stage)" "1"
+BINDIST_EXTRAS += stage1/ghc_boot_platform.h
+else
+BINDIST_EXTRAS += stage2plus/ghc_boot_platform.h
+endif
+
 include $(TOP)/mk/bindist.mk
 LIB_DIST_DIR = dist-stage$(stage)
 

diff --git a/docs/storage-mgt/Makefile b/docs/storage-mgt/Makefile
index 0ef3037..c912692 100644 (file)
--- a/docs/storage-mgt/Makefile
+++ b/docs/storage-mgt/Makefile
@@ -1,4 +1,5 @@
 TOP = ../..
+include $(TOP)/mk/boilerplate.mk
 
 #      General makefile for Latex stuff