X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=471fb4f00c1f335f4d9ab49c4c4aee172359daac;hb=367e603d0136436e783ff9ed610809bf87376262;hp=bf5b7c25e95a85f90e4bcdffb9f33fbf8778cff5;hpb=fe6a2136916bb76b95b4bc289a068728fcab41f5;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index bf5b7c2..471fb4f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -360,9 +360,9 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn
 endif
 BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
 
-OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o
+OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
 ifeq "$(BuildSharedLibs)" "YES"
-OTHER_LIBS  += libffi/libHSffi$(dyn_libsuf)
+OTHER_LIBS  += libffi/dist-install/build/libHSffi$(dyn_libsuf)
 endif
 
 # We cannot run ghc-cabal to configure a package until we have
@@ -1006,7 +1006,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries
+SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries ghc-tarballs
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \