diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-08 21:24:05 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-08 21:24:05 +0000 |
| commit | e499cbe9455b359e0325327fcdb57e2c9d621a0e (patch) | |
| tree | 2732d25044fc6890091756bc1a8a588f8dad73d3 /mk | |
| parent | 09c1e44100162eaced8db4468f2bc4e99d4b1595 (diff) | |
| download | haskell-e499cbe9455b359e0325327fcdb57e2c9d621a0e.tar.gz | |
Move some make variables around so they are available when cleaning
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 9 | ||||
| -rw-r--r-- | mk/tree.mk | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index fcf7e0d008..78b0b7a735 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 34bfcde763..3aa85277b0 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: |