projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
mk
/
boilerplate.mk
diff --git
a/mk/boilerplate.mk
b/mk/boilerplate.mk
index
13c7a86
..
9603bf2
100644
(file)
--- a/
mk/boilerplate.mk
+++ b/
mk/boilerplate.mk
@@
-2,10
+2,10
@@
#
# mk/boilerplate.mk
#
#
# mk/boilerplate.mk
#
-# The Glorious fptools Boilerplate Makefile
+# The Glorious GHC Boilerplate Makefile
#
# This one file should be included (directly or indirectly) by all Makefiles
#
# This one file should be included (directly or indirectly) by all Makefiles
-# in the fptools hierarchy.
+# in the GHC hierarchy.
#
#################################################################################
#
#################################################################################
@@
-14,10
+14,13
@@
# Setting .SUFFIXES to empty disables them all.
MAKEFLAGS += --no-builtin-rules
# Setting .SUFFIXES to empty disables them all.
MAKEFLAGS += --no-builtin-rules
-# FPTOOLS_TOP is the *relative* path to the fptools toplevel directory from the
+# GHC_TOP is the *relative* path to the fptools toplevel directory from the
# location where a project Makefile was invoked. It is set by looking at the
# current value of TOP.
#
# location where a project Makefile was invoked. It is set by looking at the
# current value of TOP.
#
+GHC_TOP := $(TOP)
+
+# $(FPTOOLS_TOP) is the old name for $(GHC_TOP), kept for backwards compat
FPTOOLS_TOP := $(TOP)
FPTOOLS_TOP := $(TOP)