projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d7e13e
)
BIN_DIST_INST_SUBDIR Needs to be defined in config.mk so ./Makefile can see it
author
Ian Lynagh
<igloo@earth.li>
Fri, 7 Dec 2007 12:13:17 +0000
(12:13 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Fri, 7 Dec 2007 12:13:17 +0000
(12:13 +0000)
bindisttest/Makefile
patch
|
blob
|
history
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/bindisttest/Makefile
b/bindisttest/Makefile
index
2b56a05
..
b2cb231
100644
(file)
--- a/
bindisttest/Makefile
+++ b/
bindisttest/Makefile
@@
-8,15
+8,6
@@
default_target: all
TOP=..
include $(TOP)/mk/boilerplate.mk
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*
all:
$(RM) -rf $(BIN_DIST_INST_SUBDIR)
$(RM) -rf ghc*
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
d44d00d
..
5283f66
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-1311,3
+1311,18
@@
WAY_o_HC_OPTS=
CONFIGURE_ARGS = @CONFIGURE_ARGS@
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)
+