From d72765457cd88b247b63b640bff7e29e0cd764b4 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 14 Aug 1998 13:13:58 +0000
Subject: [PATCH] [project @ 1998-08-14 13:13:52 by sof] Include and use
contents of version.mk
---
ghc/utils/hstags/Makefile | 1 +
ghc/utils/hstags/hstags.prl | 3 +--
ghc/utils/mkdependHS/Makefile | 1 +
ghc/utils/mkdependHS/mkdependHS.prl | 3 +--
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index c45966f0cc1d..25538400cb2c 100644
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -1,5 +1,6 @@
TOP=../..
include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/version.mk
# Note: might be overridden from cmd-line (see install rule below)
INSTALLING=0
diff --git a/ghc/utils/hstags/hstags.prl b/ghc/utils/hstags/hstags.prl
index 70a98c72a6ad..a74a5a98a9cb 100644
--- a/ghc/utils/hstags/hstags.prl
+++ b/ghc/utils/hstags/hstags.prl
@@ -56,9 +56,8 @@ while ($ARGV[0] =~ /^-./) {
push(@Files, $_);
}
-$ghc_version_info = ${ProjectVersionInt};
$DoHsCpp = ( ! $DoCpp ) ? 'cat'
- : "$HsCpp -D__HASKELL1__=2 -D__GLASGOW_HASKELL__=$ghc_version_info $Cpp_opts";
+ : "$HsCpp -D__HASKELL1__=2 -D__GLASGOW_HASKELL__=$ProjectVersionInt $Cpp_opts";
# to find Prelude.hi and friends.
$HsP_opts .= ( $INSTALLING ?
diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile
index abcd8f65a0c3..968459116d06 100644
--- a/ghc/utils/mkdependHS/Makefile
+++ b/ghc/utils/mkdependHS/Makefile
@@ -1,5 +1,6 @@
TOP=../..
include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/version.mk
INSTALLING=0
boot :: all
diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index b1e1e7c4bb5f..e821971d005e 100644
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -88,7 +88,6 @@ $Begin_magic_str = "# DO NOT DELETE: Beginning of Haskell dependencies\n";
$End_magic_str = "# DO NOT DELETE: End of Haskell dependencies\n";
@Obj_suffix = ("o");
@File_suffix = ();
-$ghc_version_info = ${ProjectVersionInt};
$Import_dirs = '.';
%Syslibs = ();
@@ -116,7 +115,7 @@ if ( $Status ) {
push(@Defines,
( #OLD: "-D__HASKELL1__=$Haskell_1",
- "-D__GLASGOW_HASKELL__=$ghc_version_info"));
+ "-D__GLASGOW_HASKELL__=$ProjectVersionInt"));
@Import_dirs = split(/:/,$Import_dirs);
@Include_dirs = split(/\s+/,$Include_dirs); # still has -I's in it
--
GitLab