Fix Trac #1814 (staging interaction in Template Haskell and GHCi), and add comments

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fbd8ca..2e0bbe1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -252,6 +252,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
        $(MAKE) prefix=$(BIN_DIST_DIR) install
+       $(MAKE) prefix=$(BIN_DIST_DIR) install-docs
 
 binary-dist::
        cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
@@ -302,9 +303,7 @@ binary-dist::
        $(MAKE) -C gmp       binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C includes  binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C compiler  binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
-       # Setting _way here is a nasty hack to make sure we get
-       # libHSrts*.a etc rather than just libHSrts.a
-       $(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES _way='*'
+       $(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C driver    binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C utils     binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C docs      binary-dist DOING_BIN_DIST=YES
@@ -331,6 +330,8 @@ binary-dist::
        echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
        echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
        echo "XMLDocWays = $(XMLDocWays)"                            >> $(VARFILE)
+       # We won't actually use xsltproc, but we need to know if it's "" or not
+       echo "XSLTPROC = $(XSLTPROC)"                                >> $(VARFILE)
        echo "TARGETPLATFORM = $(TARGETPLATFORM)"                    >> $(VARFILE)
        echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"                        >> $(VARFILE)