summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-09-19 13:35:55 +0000
committerIan Lynagh <igloo@earth.li>2008-09-19 13:35:55 +0000
commit09bb1eb4d782fd67c36145fd230bcb201d1548ba (patch)
tree33c5939e0176924a9a0070caaab2b1f63da5a04c /Makefile
parent9b20d38e5ab6b48e5dba7584296dd5dd4801549d (diff)
downloadhaskell-09bb1eb4d782fd67c36145fd230bcb201d1548ba.tar.gz
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 96d0996165..ac55576a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -513,7 +513,7 @@ SRC_DIST_FILES += \
# - 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
-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_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2