[project @ 1997-03-20 22:21:55 by sof]

2.02 final update

diff --git a/ghc/utils/hscpp/Makefile b/ghc/utils/hscpp/Makefile
index 003196f..ddd80d1 100644 (file)
--- a/ghc/utils/hscpp/Makefile
+++ b/ghc/utils/hscpp/Makefile
@@ -8,7 +8,7 @@ SCRIPT_SUBST_VARS=RAWCPP
 
 # no INTERP: do *not* want #! script stuck on the front
 # what's the deal? I'll add it for now  -- SOF
-INTERP=$(PERL)
+INTERP=perl
 
 #
 # install setup

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index 6350a01..f6c1661 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -46,7 +46,7 @@ endif
 #
 # what's the deal? I'll add it for now (and perhaps pay for it later :-)
 #  -- SOF
-INTERP=$(PERL)
+INTERP=perl
 
 #
 # install setup

diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile
index 7a2b69a..8c1cc44 100644 (file)
--- a/ghc/utils/mkdependHS/Makefile
+++ b/ghc/utils/mkdependHS/Makefile
@@ -16,7 +16,8 @@ SCRIPT_SUBST_VARS= \
  PRELUDE_DIRS \
  PROJECTVERSION SED
 
-INTERP=$(PERL)
+INTERP=perl
+
 #
 # install setup
 #

diff --git a/ghc/utils/stat2resid/Makefile b/ghc/utils/stat2resid/Makefile
index b6108c2..da92520 100644 (file)
--- a/ghc/utils/stat2resid/Makefile
+++ b/ghc/utils/stat2resid/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.4 1997/03/19 20:44:56 simonpj Exp $
+# $Id: Makefile,v 1.5 1997/03/20 22:21:55 sof Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -18,7 +18,7 @@ INSTALLING=0
 
 SCRIPT_SUBST_VARS=TMPDIR SCRIPT_PATH
 
-INTERP=$(PERL)
+INTERP=perl
 CLEAN_FILES += $(SCRIPT_PROG)
 
 #
@@ -27,9 +27,13 @@ CLEAN_FILES += $(SCRIPT_PROG)
 # is to be installed or not.
 #
 ifeq "$(INSTALLING)" "1"
-SCRIPT_PATH:=$(libdir)
+ifeq "$(BIN_DIST)" "1"
+SCRIPT_PREFIX_FILES += prefix.txt
 else
-SCRIPT_PATH:=$(FPTOOLS_TOP_ABS)/ghc/utils/stat2resid
+INSTLIBDIR_GHC:=$(libdir)
+endif
+else
+INSTLIBDIR_GHC:=$(FPTOOLS_TOP_ABS)/ghc/utils/stat2resid
 endif
 
 #

diff --git a/ghc/utils/stat2resid/prefix.txt b/ghc/utils/stat2resid/prefix.txt
new file mode 100644 (file)
index 0000000..798670f
--- /dev/null
+++ b/ghc/utils/stat2resid/prefix.txt
@@ -0,0 +1,12 @@
+#
+# stat2resid - generating graphs from garbage collection stats.
+#
+# To use the script on your system, the following variable
+# needs to be uncommented and set, if it hasn't already
+# been set above automatically:
+#
+#$INSTLIBDIR_GHC='/local/fp/lib/fptools/i386-unknown-footos/ghc-2.02';
+#
+#
+# Pls ignore the gumpf that immediately follows..
+#

diff --git a/ghc/utils/stat2resid/stat2resid.prl b/ghc/utils/stat2resid/stat2resid.prl
index f1b3c9e..80f4b39 100644 (file)
--- a/ghc/utils/stat2resid/stat2resid.prl
+++ b/ghc/utils/stat2resid/stat2resid.prl
@@ -3,7 +3,7 @@
 #
 # Perl script expect bindings for the following variables to be prepended
 #
-#   TMPDIR SCRIPT_PATH
+#   TMPDIR INSTLIBDIR_GHC
 #
 
 $debug = 0;
@@ -16,7 +16,7 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
 }
 
-@INC = ( ${SCRIPT_PATH} );
+@INC = ( ${INSTLIBDIR_GHC} );
 
 require('parse-gcstats.prl')   || die "Can't load parse-gcstats.prl!\n";
 require('process-gcstats.prl') || die "Can't load process-gcstats.prl!\n";