Commit 2670dc47 authored by Simon Marlow's avatar Simon Marlow

fix source dists

parent 0911c7fb
......@@ -397,6 +397,7 @@ binary-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)
#
......@@ -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 \
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
dist dist-manifest dist-package :: project-check
# 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-bundle : project-check
hc-file-bundle :
$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \
......
......@@ -262,45 +262,6 @@ MOSTLY_CLEAN_FILES += \
*.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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment