X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=61b139f1403ab04db2345b4e1a72ddd398b869f7;hb=7654ff058ca281756dd98ee976685a9261df63f0;hp=16fe934a3a95fe0904a18771c2e2cc01de1bace9;hpb=027caa7f6b842751f12c1d08e90bde91a0e38a5a;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 16fe934..61b139f 100644
--- a/Makefile
+++ b/Makefile
@@ -336,6 +336,7 @@ binary-dist::
 	$(MAKE) -C driver              binary-dist WHERE_AM_I=$(WHERE_AM_I)/driver
 	$(MAKE) -C utils               binary-dist WHERE_AM_I=$(WHERE_AM_I)/utils
 	$(MAKE) -C docs                binary-dist WHERE_AM_I=$(WHERE_AM_I)/docs
+	$(MAKE) -C libffi              binary-dist WHERE_AM_I=$(WHERE_AM_I)/libffi
 	$(MAKE) -C libraries           binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries
 	$(MAKE) -C libraries/Cabal/doc binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries/Cabal/doc
 # Now thinks get messier. Some files we need to move around, rename or
@@ -512,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