projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change ghc-pwd's license to a string Cabal recognises
[ghc-hetmet.git]
/
bindisttest
/
Makefile
diff --git
a/bindisttest/Makefile
b/bindisttest/Makefile
index
2780e5f
..
cf8e920
100644
(file)
--- a/
bindisttest/Makefile
+++ b/
bindisttest/Makefile
@@
-17,6
+17,7
@@
default_target: all
# Ideally we'd just include something to give us variables
# for paths and arguments to tools etc, and those set in mk/build.mk.
TOP=..
# Ideally we'd just include something to give us variables
# for paths and arguments to tools etc, and those set in mk/build.mk.
TOP=..
+include $(TOP)/mk/tree.mk
include $(TOP)/mk/config.mk
ifeq "$(TEST_PREP)" "YES"
include $(TOP)/mk/config.mk
ifeq "$(TEST_PREP)" "YES"
@@
-26,9
+27,9
@@
BIN_DIST_TEST_TAR_BZ2 = ../$(BIN_DIST_TAR_BZ2)
endif
all:
endif
all:
- $(RM) -rf $(BIN_DIST_INST_SUBDIR)
- $(RM) -rf a/b/c/*
- $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
+ "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+ "$(RM)" $(RM_OPTS_REC) a/b/c/*
+ "$(RM)" $(RM_OPTS) HelloWorld HelloWorld.o HelloWorld.hi output
# We use the a/b/c subdirectory as configure looks for install-sh in
# . .. ../.. and we don't want it to find the build system's install-sh.
#
# We use the a/b/c subdirectory as configure looks for install-sh in
# . .. ../.. and we don't want it to find the build system's install-sh.
#
@@
-40,7
+41,7
@@
ifeq "$(Windows)" "YES"
mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else
cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else
cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
- cd a/b/c/$(BIN_DIST_NAME) && make install
+ cd a/b/c/$(BIN_DIST_NAME) && $(MAKE) install
endif
$(BIN_DIST_INST_DIR)/bin/runghc HelloWorld > output
$(CONTEXT_DIFF) output expected_output
endif
$(BIN_DIST_INST_DIR)/bin/runghc HelloWorld > output
$(CONTEXT_DIFF) output expected_output
@@
-51,11
+52,14
@@
endif
$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
clean distclean:
$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
clean distclean:
- $(RM) -rf $(BIN_DIST_INST_SUBDIR)
- $(RM) -rf a/b/c/*
- $(RM) HelloWorld HelloWorld.o HelloWorld.hi output
+ "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
+ "$(RM)" $(RM_OPTS_REC) a/b/c/*
+ "$(RM)" $(RM_OPTS) HelloWorld HelloWorld.o HelloWorld.hi output
# Ignore a load of other standard targets
install install-docs doc:
@:
# Ignore a load of other standard targets
install install-docs doc:
@:
+show:
+ @echo '$(VALUE)="$($(VALUE))"'
+