[project @ 2002-05-01 13:11:24 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index f1a39d4..97717f4 100644 (file)
--- 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
 
@@ -300,9 +303,8 @@ hc-file-bundle : project-check
             $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
          -name "*.hsc" -print | sed 's/hsc$$/hs/g' >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimWrappers.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/rename/ParseIface.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/hslibs/hssource/HsParser.hs >> hc-files-to-go
@@ -322,14 +324,15 @@ 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 ::
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
        for i in $(SUBDIRS); do \
           if [ -d $$i ]; then \
-             $(MAKE) -C $$i boot all; \
+             $(MAKE) -C $$i boot; \
+             $(MAKE) -C $$i all; \
              if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
              fi; \
        done