diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-12-07 12:13:17 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-12-07 12:13:17 +0000 |
| commit | 7230143f1621149febbebcd5447aecd2d93d1464 (patch) | |
| tree | 61d7829f9564e84450fb2862c4704458cf182cad | |
| parent | 5d7e13eab7070d6858f6b8ff572baed572967fe2 (diff) | |
| download | haskell-7230143f1621149febbebcd5447aecd2d93d1464.tar.gz | |
BIN_DIST_INST_SUBDIR Needs to be defined in config.mk so ./Makefile can see it
| -rw-r--r-- | bindisttest/Makefile | 9 | ||||
| -rw-r--r-- | mk/config.mk.in | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile index 2b56a05f56..b2cb231741 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -8,15 +8,6 @@ default_target: all TOP=.. include $(TOP)/mk/boilerplate.mk -ifeq "$(Windows)" "YES" -BIN_DIST_INST_SUBDIR = "install dir" -else -# I very much doubt that paths with spaces will work on Unix -BIN_DIST_INST_SUBDIR = installed -endif - -BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR) - all: $(RM) -rf $(BIN_DIST_INST_SUBDIR) $(RM) -rf ghc* diff --git a/mk/config.mk.in b/mk/config.mk.in index d44d00d601..5283f66791 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -1311,3 +1311,18 @@ WAY_o_HC_OPTS= CONFIGURE_ARGS = @CONFIGURE_ARGS@ +################################################################################ +# +# Bindist testing directory +# +################################################################################ + +ifeq "$(Windows)" "YES" +BIN_DIST_INST_SUBDIR = "install dir" +else +# I very much doubt that paths with spaces will work on Unix +BIN_DIST_INST_SUBDIR = installed +endif + +BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR) + |