diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-19 12:55:28 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-19 12:55:28 +0000 |
| commit | dc6dc128ff975d2f4162a2c051c11b93e3849d09 (patch) | |
| tree | 8eff3fff554b4c0da81c3c8dcf63817fe1ac4592 | |
| parent | e0f3f5f3d0f70a5c128343ac16b815e73f1c1827 (diff) | |
| download | haskell-dc6dc128ff975d2f4162a2c051c11b93e3849d09.tar.gz | |
Fix how we put libffi into bindists
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | libffi/Makefile | 20 |
2 files changed, 6 insertions, 15 deletions
@@ -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 d76ad52eef..cfcec35a1b 100644 --- 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 |