From: Ian Lynagh Date: Sat, 8 May 2010 21:24:05 +0000 (+0000) Subject: Move some make variables around so they are available when cleaning X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e499cbe9455b359e0325327fcdb57e2c9d621a0e Move some make variables around so they are available when cleaning --- diff --git a/mk/config.mk.in b/mk/config.mk.in index fcf7e0d..78b0b7a 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -785,12 +785,3 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@ ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@ ICONV_LIB_DIRS = @ICONV_LIB_DIRS@ -################################################################################ -# -# Bindist testing directory -# -################################################################################ - -BIN_DIST_INST_SUBDIR = "install dir" -BIN_DIST_INST_DIR = $(TOP)/bindisttest/$(BIN_DIST_INST_SUBDIR) - diff --git a/mk/tree.mk b/mk/tree.mk index 34bfcde..3aa8527 100644 --- a/mk/tree.mk +++ b/mk/tree.mk @@ -47,6 +47,21 @@ INPLACE_TOPDIR = $(INPLACE)/lib INPLACE_MINGW = $(INPLACE)/mingw INPLACE_PERL = $(INPLACE)/perl +################################################################################ +# +# Bindist testing directory +# +################################################################################ + +BIN_DIST_INST_SUBDIR = "install dir" +BIN_DIST_INST_DIR = bindisttest/$(BIN_DIST_INST_SUBDIR) + +################################################################################ +# +# rm +# +################################################################################ + # These are here, rather than in config.mk, as they need to exist in an # unconfigured tree so that the various clean targets can be used # without configuring: