Commit 09bb1eb4 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix building the extralibs tarball

We now need to dig the appropriate lines out of packages, rather than
just catting libraries/extra-packages, in order to find out what the
extralibs are.
parent 9b20d38e
...@@ -513,7 +513,7 @@ SRC_DIST_FILES += \ ...@@ -513,7 +513,7 @@ SRC_DIST_FILES += \
# - remove a bunch of other files that we know shouldn't be in the dist # - remove a bunch of other files that we know shouldn't be in the dist
# - tar up first the extralibs package, then the main source package # - tar up first the extralibs package, then the main source package
EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages)) EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^#" | sed "s/ .*//"))
SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2 SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
......
Supports Markdown
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