X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=e5b2eb760da7a16da4fa951ec435b0c0f19b40b6;hb=0aa68e602eaf2d5ddefe2755a851c80c433ed2d8;hp=f0714ded2a262747b4ea546c3f3b4625597ca43b;hpb=f8fa9e3748cb4579e0a42eeb9721c92db761b437;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index f0714de..e5b2eb7 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,9 @@ BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 binary-dist-pre::
+ifeq "$(BIN_DIST)" ""
+	echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
+endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
 	-rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
 	@for i in $(BIN_DIST_DIRS); do 		 	 \
@@ -253,7 +256,7 @@ SRC_DIST_FILES += \
 	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
 	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-	mk/paths.mk mk/suffix.mk mk/target.mk
+	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk
 
 dist dist-manifest dist-package :: project-check
 
@@ -321,7 +324,7 @@ ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
 all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
 
 $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
-	cd happy && make boot all
+	$(MAKE) -C happy boot all
 endif
 
 all ::