diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-10 00:50:16 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-10 00:50:16 +0000 |
| commit | 2de31b61d0a963803eb5632c9659c6093d74f345 (patch) | |
| tree | f05ed698b42976a28f1db324033c4d9694e733bc /driver | |
| parent | 0f72a4c69215d1f81760aa0000ebbbfb2ac73303 (diff) | |
| download | haskell-2de31b61d0a963803eb5632c9659c6093d74f345.tar.gz | |
bindists are now some way towards working
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Makefile | 6 | ||||
| -rw-r--r-- | driver/ghc/Makefile | 4 | ||||
| -rw-r--r-- | driver/ghci/Makefile | 4 | ||||
| -rw-r--r-- | driver/mangler/Makefile | 6 | ||||
| -rw-r--r-- | driver/split/Makefile | 6 |
5 files changed, 8 insertions, 18 deletions
diff --git a/driver/Makefile b/driver/Makefile index e81b1ea1fa..5825356058 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -28,9 +28,7 @@ INSTALL_DATAS += package.conf ghc-usage.txt ghci-usage.txt CLEAN_FILES += package.conf* stamp-pkg-conf* binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/driver - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver - $(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/driver - set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done + for FILE in Makefile $(INSTALL_DATAS); do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done + set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist WHERE_AM_I=$(WHERE_AM_I)/$$d; done include $(TOP)/mk/target.mk diff --git a/driver/ghc/Makefile b/driver/ghc/Makefile index 66a8d2ba10..fc9bb4ad3a 100644 --- a/driver/ghc/Makefile +++ b/driver/ghc/Makefile @@ -23,8 +23,6 @@ endif # ----------------------------------------------------------------------------- -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/driver/ghc - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver/ghc/ +include $(TOP)/mk/bindist.mk include $(TOP)/mk/target.mk diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile index 2c118faf2b..94fe452935 100644 --- a/driver/ghci/Makefile +++ b/driver/ghci/Makefile @@ -53,8 +53,6 @@ ghci.res : ghci.rc ghci.ico windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o ghci.res -i ghci.rc -O coff endif -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/driver/ghci - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver/ghci/ +include $(TOP)/mk/bindist.mk include $(TOP)/mk/target.mk diff --git a/driver/mangler/Makefile b/driver/mangler/Makefile index dfc7c396ba..1242d6c236 100644 --- a/driver/mangler/Makefile +++ b/driver/mangler/Makefile @@ -20,9 +20,7 @@ ifeq "$(BootingFromHc)" "YES" boot :: all endif -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/driver/mangler - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver/mangler/ - $(INSTALL_SCRIPT) $(PROG) $(BIN_DIST_DIR)/driver/mangler/ +BINDIST_EXTRAS += $(PROG) +include $(TOP)/mk/bindist.mk include $(TOP)/mk/target.mk diff --git a/driver/split/Makefile b/driver/split/Makefile index cce7618004..404cb97c4d 100644 --- a/driver/split/Makefile +++ b/driver/split/Makefile @@ -15,9 +15,7 @@ all:: $(PROG).prl INSTALL_LIBEXEC_SCRIPTS += $(PROG) CLEAN_FILES += $(PROG) $(PROG).prl -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/driver/split - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver/split/ - $(INSTALL_SCRIPT) $(PROG) $(BIN_DIST_DIR)/driver/split/ +BINDIST_EXTRAS += $(PROG) +include $(TOP)/mk/bindist.mk include $(TOP)/mk/target.mk |