[project @ 1997-03-24 04:28:10 by sof]

2.02 final update

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index f6c1661..1e5373e 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -2,7 +2,7 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 # No ways
-WAYS=
+override WAYS=
 
 # Note: might be overridden from cmd-line (see install rule below)
 INSTALLING=0
@@ -19,7 +19,7 @@ SCRIPT_SUBST_VARS=\
  PROJECTVERSION
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += INSTLIBDIR_GHC
+SCRIPT_SUBST_VARS += libdir
 endif
 
 #
@@ -31,12 +31,9 @@ ifeq "$(INSTALLING)" "1"
 TOP_PWD := $(prefix)
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES += prefix.txt
-else
-INSTLIBDIR_GHC=$(libdir)
 endif
 else
 TOP_PWD := $(FPTOOLS_TOP_ABS)
-INSTLIBDIR_GHC=$(libdir)
 HSP_IMPORTS:="$(TOP_PWD)/ghc/lib/ghc":"$(TOP_PWD)/ghc/lib/required":"$(TOP_PWD)/ghc/lib/glaExts":"$(TOP_PWD)/ghc/lib/concurrent"
 SCRIPT_SUBST_VARS += HSP_IMPORTS
 endif
@@ -51,7 +48,7 @@ INTERP=perl
 #
 # install setup
 #
-INSTALL_PROGS=$(SCRIPT_PROG)
+INSTALL_SCRIPTS+=$(SCRIPT_PROG)
 INSTALL_LIBEXECS=$(C_PROG)
 
 #

diff --git a/ghc/utils/hstags/hstags.prl b/ghc/utils/hstags/hstags.prl
index 1fc29eb..c7e137a 100644 (file)
--- a/ghc/utils/hstags/hstags.prl
+++ b/ghc/utils/hstags/hstags.prl
@@ -5,8 +5,7 @@
 #   INSTALLING
 #   TMPDIR
 #   TOP_PWD
-#   INSTLIBDIR_GHC
-#   INSTDATADIR_GHC
+#   libdir
 #   PROJECTVERSION
 #   HSP_IMPORTS
 
@@ -17,8 +16,8 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
 }
 
-$TopPwd         = "${TOP_PWD}";
-$InstLibDirGhc  = "${INSTLIBDIR_GHC}";
+$TopPwd         = "${TOP_PWD}"; # *Only* needed when using it in-situ (i.e., INSTALLING=0).
+$InstLibDirGhc  = "${libdir}";
 
 $Unlit = ( $INSTALLING ? 
            "${InstLibDirGhc}/unlit" : 
@@ -59,7 +58,7 @@ $ghc_version_info = int(${PROJECTVERSION} * 100);
 $DoHsCpp = ( ! $DoCpp ) ? 'cat'
                        : "$HsCpp -D__HASKELL1__=2 -D__GLASGOW_HASKELL__=$ghc_version_info $Cpp_opts";
 
-# to find Prelude.hi
+# to find Prelude.hi and friends.
 $HsP_opts .= ( $INSTALLING  ? 
               "-J${InstLibDirGhc}/imports" : 
               ( '-J' . join(' -J',split(/:/,${HSP_IMPORTS})) ));

diff --git a/ghc/utils/hstags/prefix.txt b/ghc/utils/hstags/prefix.txt
index 988cf8a..b67c009 100644 (file)
--- a/ghc/utils/hstags/prefix.txt
+++ b/ghc/utils/hstags/prefix.txt
@@ -2,8 +2,8 @@
 # hstags - generating a tags file from Haskell source
 #
 # To use the script on your system, the following variable
-# needs to be set (and uncommented), if it hasn't already
+# needs to be set (and uncommented!), if it hasn't already
 # been set above:
 #
-#$INSTLIBDIR_GHC='/local/fp/lib/ghc';
+#$libdir='/local/fp/lib/sparc-sun-sunos4/ghc-2.02';
 #