[project @ 2003-07-24 15:12:35 by simonmar]
[ghc-hetmet.git] / Makefile
index 75f49d1..496fefd 100644 (file)
--- a/Makefile
+++ b/Makefile
-#################################################################################
+############################################################################
 #
 #                      fptools/Makefile
 #
 #              This is the main Makefile for fptools.
 #
-#################################################################################
+############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
-SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
-#
-# Totally evil hack to make the setting of SUBDIRS be dependent
-# on whether we do `make install' or not. Having a $(ifeq ... ) would
-# be preferable..
-CURRENT_TARGET = $@
-SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
+# find the projects that actually exist...
+ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+
+# and filter only those that the user requested, if necessary
+ifeq "$(ProjectsToBuild)" ""
+SUBDIRS = $(ProjectsThatExist)
+else
+SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
+endif
+
+ifneq "$(Project)" ""
+   ifeq "$(Project)" "GreenCard"
+       ProjectDirectory=green-card
+   else
+       ifeq "$(Project)" "HaskellDirect"
+               ProjectDirectory=hdirect
+       else
+               ProjectDirectory=$(Project)
+       endif
+   endif
+   include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
+endif
+
+# -----------------------------------------------------------------------------
+# Certain targets require that Project is set from the command line.
+
+CURRENT_TARGET = $(MAKECMDGOALS)
+project-check :
+       @if [ "$(Project)" = "" ]; then \
+               echo "  You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
+               echo "  eg. make $(CURRENT_TARGET) Project=Ghc"; \
+               exit 1; \
+       fi
+
+# -----------------------------------------------------------------------------
+# Targets: all, stage1, stage2, stage3
+
+DIST_CLEAN_FILES += config.cache config.status
 
 #
-# Files to include in fptools source distribution
+# If you've ended up using an in-place version of Happy,
+# make sure it gets built early on.
 #
-SRC_DIST_DIRS += mk docs CONTRIB $(ProjectsToBuild)
-SRC_DIST_FILES += configure.in config.guess config.sub configure README ANNOUNCE ANNOUNCE-2.02 NEWS INSTALL Makefile install-sh
+ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
+build : $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
 
+$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
+       $(MAKE) -C happy boot all
+endif
 
-#
+# Build all projects that we know about
+build :
+       @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; \
+             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+             $(MAKE) -C $$i all; \
+             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+             fi; \
+       done
+
+ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
+
+stage1 : build
+
+stage2 :
+       $(MAKE) -C ghc/compiler boot stage=2
+       $(MAKE) -C ghc/compiler stage=2
+
+stage3 :
+       $(MAKE) -C ghc/compiler boot stage=3
+       $(MAKE) -C ghc/compiler stage=3
+
+bootstrap  : bootstrap2
+bootstrap2 : stage1 stage2
+bootstrap3 : stage1 stage2 stage3
+
+all :: bootstrap
+
+# We want to install the stage 2 bootstrapped compiler by default, but we let
+# the user override this by saying 'make install stage=1', for example.
+ifeq "$(stage)" ""
+INSTALL_STAGE = stage=2
+else
+INSTALL_STAGE =
+endif
+
+else # Not building GHC
+
+all :: build
+
+INSTALL_STAGE =
+
+endif
+
+boot ::
+       @echo "Please use \`make all' only from the top-level, or \`make boot' followed"
+       @echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
+
+install ::
+       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+       for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
+          if [ -d $$i ]; then \
+             $(MAKE) -C $$i $(INSTALL_STAGE) install; \
+             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+             fi; \
+       done
+
+install-docs ::
+       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+       for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
+          if [ -d $$i ]; then \
+             $(MAKE) -C $$i $(INSTALL_STAGE) install-docs; \
+             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+             fi; \
+       done
+
+# -----------------------------------------------------------------------------
 # Making a binary distribution
 #
-BIN_DIST_TMPDIR=$(shell pwd)
-BIN_DIST_NAME=fptools
+# To make a particular binary distribution: 
+# set $(Project) to the name of the project, capitalised (eg. Ghc or Happy).
+
+# `dist' `binary-dist'
+#      Create a distribution tar file for this program. The tar file
+#      should be set up so that the file names in the tar file start with
+#      a subdirectory name which is the name of the package it is a
+#      distribution for. This name can include the version number.
+#
+#      For example, the distribution tar file of GCC version 1.40 unpacks
+#      into a subdirectory named `gcc-1.40'.
+# 
+#      The easiest way to do this is to create a subdirectory
+#      appropriately named, use ln or cp to install the proper files in
+#      it, and then tar that subdirectory.
+# 
+#      The dist target should explicitly depend on all non-source files
+#      that are in the distribution, to make sure they are up to date in
+#      the distribution. See Making Releases.
+#
+#      binary-dist is an FPtools addition for binary distributions
+# 
+
+binary-dist :: project-check
+
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 
 #
-# list of toplevel `projects' to include in binary distrib.
+# list of toplevel directories to include in binary distrib.
 #
-BIN_DIST_DIRS=ghc
+BIN_DIST_MAIN_DIR=$($(Project)MainDir)
+BIN_DIST_DIRS=$($(Project)BinDistDirs)
 
 binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
              distrib/configure-bin.in \
-             distrib/README \
              distrib/INSTALL \
-             distrib/ANNOUNCE \
-             distrib/PATCHLEVEL \
+             $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
+             $(BIN_DIST_MAIN_DIR)/VERSION \
+             $(BIN_DIST_MAIN_DIR)/LICENSE \
+             $(BIN_DIST_MAIN_DIR)/README \
              glafp-utils/mkdirhier/mkdirhier \
-             ghc/RELEASE \
              install-sh \
              config.guess \
-             config.sub
+             config.sub   \
+             aclocal.m4
+
+#
+# binary-dist creates a binary bundle, set BIN_DIST_NAME
+# to package name and do `make binary-dist Project=<project-name>'
+# (normally this just a thing you would do from the toplevel of fptools)
+#
+.PHONY: binary-dist-pre binary-dist binary-pack
+
+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) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+       -echo "BIN_DIST_DIRS = $(BIN_DIST_DIRS)"
+       @for i in $(BIN_DIST_DIRS); do                   \
+         if test -d "$$i"; then                         \
+          echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+          $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+          echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+          $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+          echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+          $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+          echo $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
+               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+          $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
+               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+         fi; \
+       done
 
 binary-dist::
        @for i in $(BIN_DIST_TOP); do \
-         echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
-         cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+         if test -f "$$i"; then \
+            echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+            cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+         fi; \
        done;
-       @echo "hackily rename some of these chaps.."
-       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in 
-       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+       @echo "Configuring the Makefile for this project..."
+       touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        @echo "Generating a shippable configure script.."
-       #-(cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
-
-#
-# Creating and copying the documentation into the bin-dist tree.
-# (this tries to be oh-so-general about copyng docs, but isn't really
-# suited for anything else than ghc/)
-#
-# Needless to say, the rule below could be cleaned up somewhat.
+       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+       ( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
+       if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
+               cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
+                       $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+       fi
+       if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
+               cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
+                       $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+       fi
 #
-binary-dist::
-       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion)
-       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion)
-       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion)
-       @echo "Making html documentation.."
-       @echo "For fptools.."
-       #$(MAKE) -C docs --no-print-directory $(MFLAGS) html
-       #cp -f docs/html/* docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion)
-       #@echo "Done."
-       #@for i in $(BIN_DIST_DIRS); do \
-       #   echo "For $$i.."; \
-       #   echo cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo "Done."; \
-       #done
-       ##@echo "Making dvi files.."
-       #@echo "For fptools.."
-       #-$(MAKE) -C docs --no-print-directory $(MFLAGS) dvi
-       #-cp -f docs/*.dvi  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion)
-       #@echo "Done."
-       #@for i in $(BIN_DIST_DIRS); do \
-       #   echo "For $$i.."; \
-       #   echo cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo "Done."; \
-       #done
-       #@echo "Making info files.."
-       #@echo "For fptools.."
-       #-$(MAKE) -C docs --no-print-directory $(MFLAGS) info
-       #-cp -f docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion)/
-       #@echo "Done."
-       #@for i in $(BIN_DIST_DIRS); do \
-       #   echo "For $$i docs.."; \
-       #   echo cp -f $$i/docs/users_guide/*.info  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/users_guide/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/$(GhcProjectNameShort)-$(GhcProjectVersion); \
-       #   echo "Done."; \
-       #done
-
-#
-# binary dist'ing hslibs/, hackily.
+# binary dist'ing the documentation.  
+# Which documentation to build/install is hardcoded below.
 #
+
+BINDIST_DOC_WAYS = html ps
+# BINDIST_DOC_WAYS =
+
 binary-dist ::
-       @echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs;
-       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs;
-       $(MAKE) -C hslibs $(MFLAGS) install \
-               BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
-               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+       @for i in $(BIN_DIST_DIRS); do                          \
+         if test -d "$$i"; then                                \
+           $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS);       \
+           echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
+               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)      \
                exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion) \
-               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
-               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
-               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/ghc-$(ProjectVersion) ;
+               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+           $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
+               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)      \
+               exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+         fi \
+       done
 
-# Even more of a hack, but I'm too tired to fix this up right now..
-BIN_DIST_SCRIPTS_NEEDING_RENAMING=ghc stat2resid hstags mkdependHS
+# Rename scripts to $i.prl and $i.sh where necessary.
+# ToDo: do this in a cleaner way...
 
+ifneq "$($(Project)BinDistPrlScripts)" ""
 binary-dist::
-       @for i in $(BIN_DIST_SCRIPTS_NEEDING_RENAMING); do \
+       @for i in $($(Project)BinDistPrlScripts); do \
             echo "Renaming $$i to $$i.prl"; \
-           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i.prl; \
+           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \
        done
-       @echo "Renaming hscpp to hscpp.prl"
-       @$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp.prl
+endif
 
-dist :: dist-pre
-include $(TOP)/mk/target.mk
-dist :: dist-post
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
+binary-dist::
+       @for i in $($(Project)BinDistLibPrlScripts); do \
+            echo "Renaming $$i to $$i.prl"; \
+           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \
+       done
+endif
+
+ifneq "$($(Project)BinDistShScripts)" ""
+binary-dist::
+       @for i in $($(Project)BinDistShScripts); do \
+            echo "Renaming $$i to $$i.sh"; \
+           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+       done
+endif
+
+#
+# Do this separately for now
+# 
+binary-pack::
+       ( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) )
+
+ifneq "$(way)" ""
+.PHONY: package-way-dist
+package-way-dist::
+       ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
+       gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
+endif
+
+ifneq "$(way)" ""
+remove-way-dist::
+       ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec $(RM) {} \; )
+endif
 
 binary-dist::
        @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
+
+# -----------------------------------------------------------------------------
+# Building source distributions
+#
+# Do it like this: 
+#
+#      $ make
+#      $ make dist Project=Ghc
+#
+# WARNING: `make dist' calls `make distclean' before tarring up the tree.
+#
+
+.PHONY: dist
+
+#
+# Directory in which we're going to build the src dist
+#
+SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
+
+#
+# Files to include in source distributions
+#
+SRC_DIST_DIRS += docs distrib $(SUBDIRS)
+SRC_DIST_FILES += \
+       configure.in config.guess config.sub configure \
+       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/package.mk mk/suffix.mk mk/target.mk
+
+dist dist-manifest dist-package :: project-check
+
+# clean the tree first, leaving certain extra files in place (eg. configure)
+dist :: distclean
+
+dist ::
+       -rm -rf $(SRC_DIST_DIR)
+       -$(RM) $(SRC_DIST_NAME).tar.gz
+       mkdir $(SRC_DIST_DIR)
+       mkdir $(SRC_DIST_DIR)/mk
+       $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh
+       $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh
+
+# Automatic generation of a MANIFEST file for a source distribution
+# tree that is ready to go.
+dist-manifest ::
+       cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST
+
+dist-package :: dist-package-tar-gz
+
+SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS))
+
+dist-package-tar-gz ::
+       $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME)
+
+dist-package-zip ::
+       cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \
+              $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME)-src.zip $(SRC_DIST_PATHS)
+
+# -----------------------------------------------------------------------------
+# HC file bundles
+
+hc-file-bundle : project-check
+       $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
+       $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
+       $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+            $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
+         \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
+       for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -print` ""; do \
+            if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
+               echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
+            fi; \
+       done;
+       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
+       tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+
+CLEAN_FILES += hc-files-to-go *-hc.tar.gz
+
+# -----------------------------------------------------------------------------
+
+# Turn off target.mk's rules for 'all', 'boot' and 'install'.
+NO_BOOT_TARGET=YES
+NO_ALL_TARGET=YES
+NO_INSTALL_TARGET=YES
+
+include $(TOP)/mk/target.mk
+
+# -----------------------------------------------------------------------------
+