diff options
author | Ian Lynagh <igloo@earth.li> | 2007-05-31 14:35:05 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2007-05-31 14:35:05 +0000 |
commit | 430453c5131592b6147a80202dc5f7fbe3f3d5fd (patch) | |
tree | 9c7cdf6b13a8586dfa653bb9ff393da5640d2599 /Makefile | |
parent | ad9d754d2b18d4dd027884e082c20777a29ef7d4 (diff) | |
download | haskell-430453c5131592b6147a80202dc5f7fbe3f3d5fd.tar.gz |
Rework the build system a bit
Key changes:
* Always build as if BIN_DIST is 1. BIN_DIST is thus removed.
* Libraries are configured with prefix set to $$topdir rather than $(prefix)
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -135,6 +135,7 @@ endif # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too install :: check-packages + $(INSTALL_DIR) $(bindir) @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \ echo "------------------------------------------------------------------------"; \ @@ -248,10 +249,6 @@ BINARY_DIST_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d) binary-dist:: binary-dist-pre $(BINARY_DIST_PRE_RULES) binary-dist-pre:: -ifeq "$(BIN_DIST)" "" - @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk" - @false -endif -rm -rf $(BIN_DIST_DIR) -$(RM) $(BIN_DIST_DIR).tar.gz $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) |