Commit db8b5b57 authored by sof's avatar sof
Browse files

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

2.02 final update
parent eed35d37
...@@ -2,7 +2,7 @@ TOP=../.. ...@@ -2,7 +2,7 @@ TOP=../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
# No ways # No ways
WAYS= override WAYS=
# Note: might be overridden from cmd-line (see install rule below) # Note: might be overridden from cmd-line (see install rule below)
INSTALLING=0 INSTALLING=0
...@@ -19,7 +19,7 @@ SCRIPT_SUBST_VARS=\ ...@@ -19,7 +19,7 @@ SCRIPT_SUBST_VARS=\
PROJECTVERSION PROJECTVERSION
ifneq "$(BIN_DIST)" "1" ifneq "$(BIN_DIST)" "1"
SCRIPT_SUBST_VARS += INSTLIBDIR_GHC SCRIPT_SUBST_VARS += libdir
endif endif
# #
...@@ -31,12 +31,9 @@ ifeq "$(INSTALLING)" "1" ...@@ -31,12 +31,9 @@ ifeq "$(INSTALLING)" "1"
TOP_PWD := $(prefix) TOP_PWD := $(prefix)
ifeq "$(BIN_DIST)" "1" ifeq "$(BIN_DIST)" "1"
SCRIPT_PREFIX_FILES += prefix.txt SCRIPT_PREFIX_FILES += prefix.txt
else
INSTLIBDIR_GHC=$(libdir)
endif endif
else else
TOP_PWD := $(FPTOOLS_TOP_ABS) 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" 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 SCRIPT_SUBST_VARS += HSP_IMPORTS
endif endif
...@@ -51,7 +48,7 @@ INTERP=perl ...@@ -51,7 +48,7 @@ INTERP=perl
# #
# install setup # install setup
# #
INSTALL_PROGS=$(SCRIPT_PROG) INSTALL_SCRIPTS+=$(SCRIPT_PROG)
INSTALL_LIBEXECS=$(C_PROG) INSTALL_LIBEXECS=$(C_PROG)
# #
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
# INSTALLING # INSTALLING
# TMPDIR # TMPDIR
# TOP_PWD # TOP_PWD
# INSTLIBDIR_GHC # libdir
# INSTDATADIR_GHC
# PROJECTVERSION # PROJECTVERSION
# HSP_IMPORTS # HSP_IMPORTS
...@@ -17,8 +16,8 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names ...@@ -17,8 +16,8 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
$ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
} }
$TopPwd = "${TOP_PWD}"; $TopPwd = "${TOP_PWD}"; # *Only* needed when using it in-situ (i.e., INSTALLING=0).
$InstLibDirGhc = "${INSTLIBDIR_GHC}"; $InstLibDirGhc = "${libdir}";
$Unlit = ( $INSTALLING ? $Unlit = ( $INSTALLING ?
"${InstLibDirGhc}/unlit" : "${InstLibDirGhc}/unlit" :
...@@ -59,7 +58,7 @@ $ghc_version_info = int(${PROJECTVERSION} * 100); ...@@ -59,7 +58,7 @@ $ghc_version_info = int(${PROJECTVERSION} * 100);
$DoHsCpp = ( ! $DoCpp ) ? 'cat' $DoHsCpp = ( ! $DoCpp ) ? 'cat'
: "$HsCpp -D__HASKELL1__=2 -D__GLASGOW_HASKELL__=$ghc_version_info $Cpp_opts"; : "$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 ? $HsP_opts .= ( $INSTALLING ?
"-J${InstLibDirGhc}/imports" : "-J${InstLibDirGhc}/imports" :
( '-J' . join(' -J',split(/:/,${HSP_IMPORTS})) )); ( '-J' . join(' -J',split(/:/,${HSP_IMPORTS})) ));
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# hstags - generating a tags file from Haskell source # hstags - generating a tags file from Haskell source
# #
# To use the script on your system, the following variable # 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: # been set above:
# #
#$INSTLIBDIR_GHC='/local/fp/lib/ghc'; #$libdir='/local/fp/lib/sparc-sun-sunos4/ghc-2.02';
# #
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment