[project @ 1997-03-19 04:32:44 by sof]

PROJECT* vars defined + make reading opts.mk optional

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 08e36c9..9c55c3b 100644 (file)
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -26,7 +26,7 @@ TOP:=$(GHC_TOP)
 # augments or overrides previously set variables.
 # -----------------------------------------------------------------
 
-include $(TOP)/mk/paths.mk
-include $(TOP)/mk/opts.mk
+-include $(TOP)/mk/paths.mk
+-include $(TOP)/mk/opts.mk
 include $(TOP)/mk/suffix.mk
 

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 635956a..2309319 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -3,6 +3,12 @@
 # ghc project specific make variables
 #
 
+#
+PROJECTVERSION=$(GhcBuildeeVersion)
+PROJECTNAME=$(GhcProjectName)
+PROJECTPATCHLEVEL=$(GhcProjectPatchLevel)
+
+
 # Override default haskell compiler if required
 #HC                    = $(WithGhcHc)
 HaskellCompilerType    = $(WithGhcHcType)