fix source dists

diff --git a/Makefile b/Makefile
index 1a48e37..5da5bbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -397,6 +397,7 @@ binary-dist::
 #
 # Directory in which we're going to build the src dist
 #
 #
 # Directory in which we're going to build the src dist
 #

+SRC_DIST_NAME=ghc-$(ProjectVersion)

 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
 #
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
 #

@@ -405,14 +406,12 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
 SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \

-       aclocal.m4 README Makefile install-sh \
+       aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile 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 \
        mk/fptools.css mk/fix_install_names.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 \
        mk/fptools.css mk/fix_install_names.sh
 

-dist dist-manifest dist-package :: project-check
-

 # clean the tree first, leaving certain extra files in place (eg. configure)
 dist :: distclean
 
 # clean the tree first, leaving certain extra files in place (eg. configure)
 dist :: distclean
 

@@ -446,7 +445,7 @@ dist-package-zip ::
 # -----------------------------------------------------------------------------
 # HC file bundles
 
 # -----------------------------------------------------------------------------
 # HC file bundles
 

-hc-file-bundle : project-check
+hc-file-bundle :

        $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
        $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
        $(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \
        $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
        $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
        $(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \

diff --git a/mk/paths.mk b/mk/paths.mk
index b616e7d..aff1274 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -262,45 +262,6 @@ MOSTLY_CLEAN_FILES += \
  *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s *.a.list
 
 #------------------------------------------------------------------
  *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s *.a.list
 
 #------------------------------------------------------------------

-#
-# Distribution setup
-#
-# Following variables are used for creating source and binary distributions:
-#
-#  SRC_DIST_NAME && BIN_DIST_NAME  -- the package names
-#
-#  SRC_DIST_FILES = list of extra files to include from a build tree into a source
-#                   distribution
-#
-#  SRC_DIST_DIR  = what the current directory in the source/build tree
-#                  maps to in the source distrib. tree being created.
-#
-SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
-
-#
-# Binary distributions proceeds as follows:
-#
-# Fromthe top of a build tree, you do `make binary-dist'. The
-# canned rule for this  (in target.mk) will then do a binary
-# install to a temporary directory before packaging it all up.
-# The following variables guide the binary-dist:
-#
-#  BIN_DIST_TMPDIR= the absolute path to where the temporary directory
-#                  structure of a binary distribution should be created.
-#                  [Default: toplevel from which you issue `make binary-dist']
-#  BIN_DIST_NAME=   what to call the thing.
-#
-#  BIN_DIST_DIRS=   at the toplevel, list of directories to descend into when
-#                  building the distribution tree.
-#
-#  An extra directory variable that is set during bin-dists is $(bindist_top), giving
-#  the abs. path to the root of the binary installation tree. (useful when punting
-#  stuff like README and ANNOUNCE into a distrib, for instance)
-#
-#  The layout of a binary distribution is described in the
-#  installation documentation.
-#
-

 
 # Directory in which DLLs are dumped so as not to get picked up by running
 # programs (e.g. ghc or hsc) that run in the build tree
 
 # Directory in which DLLs are dumped so as not to get picked up by running
 # programs (e.g. ghc or hsc) that run in the build tree