Fix how we put libffi into bindists

diff --git a/Makefile b/Makefile
index 16fe934..96d0996 100644 (file)
--- 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

diff --git a/libffi/Makefile b/libffi/Makefile
index d76ad52..cfcec35 100644 (file)
--- a/libffi/Makefile
+++ b/libffi/Makefile
@@ -104,19 +104,9 @@ clean distclean maintainer-clean ::
 
 include $(TOP)/mk/target.mk
 
-binary-dist:
-       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/libffi
-       $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/libffi/
-ifneq "$(HaveLibFFI)" "YES"
-       $(INSTALL_DATA)    $(BINDIST_STAMPS)   $(BIN_DIST_DIR)/libffi/
-  ifneq "$(INSTALL_PROGS)" ""
-       $(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/libffi/
-  endif
-  ifneq "$(INSTALL_LIBS)" ""
-       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/libffi/
-  endif
-  ifneq "$(INSTALL_HEADERS)" ""
-       $(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/libffi/
-  endif
-endif
+BINDIST_EXTRAS += $(BINDIST_STAMPS)
+BINDIST_EXTRAS += $(INSTALL_PROGS)
+BINDIST_EXTRAS += $(INSTALL_LIBS)
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk