X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2b1e5ab049759ee4cdc54a713b19da4f7d3960bb;hb=57d15e1c1b85a8ec417e843827e5c8d271f7b1da;hp=784574b71713a7237ef5d25931894b801fa43737;hpb=aa28d2d407ecd14edc2d37afa20a06e2bef702b2;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 784574b..2b1e5ab 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,6 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
 	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -179,7 +178,6 @@ binary-dist ::
 	   done; \
 	done
 	@rm -f .doclog
-endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -310,6 +308,18 @@ CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status
 
+#
+# If you've ended up using an in-place version of Happy,
+# make sure it gets built early on.
+#
+ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
+all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+
+$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace :
+	cd ghc/includes && make boot
+	cd happy && make boot all
+endif
+
 all ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \