[project @ 1997-05-19 05:48:50 by sof]

ghc-2-03-p1 merged onto main trunk

4 files changed, 28 insertions, 12 deletions

diff --git a/ghc/utils/Makefile b/ghc/utils/Makefile
index 78554154df..edb0ecee8e 100644
--- a/ghc/utils/Makefile
+++ b/ghc/utils/Makefile
@@ -15,10 +15,11 @@ SUBDIRS = hp2ps		\
 	  hscpp		\
 	  hstags	\
 	  mkdependHS	\
-	  parallel	\
+	  parallel      \
 	  stat2resid	\
 	  ugen		\
 	  unlit
+
 endif
 
 # "heap-view" is not in the list because (a) it requires
diff --git a/ghc/utils/hstags/hstags.prl b/ghc/utils/hstags/hstags.prl
index c7e137a543..9d4afddabc 100644
--- a/ghc/utils/hstags/hstags.prl
+++ b/ghc/utils/hstags/hstags.prl
@@ -6,6 +6,7 @@
 #   TMPDIR
 #   TOP_PWD
 #   libdir
+#   libexecdir
 #   PROJECTVERSION
 #   HSP_IMPORTS
 
@@ -18,20 +19,21 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
 
 $TopPwd         = "${TOP_PWD}"; # *Only* needed when using it in-situ (i.e., INSTALLING=0).
 $InstLibDirGhc  = "${libdir}";
+$InstLibExecDirGhc  = "${libexecdir}";
 
 $Unlit = ( $INSTALLING ? 
-           "${InstLibDirGhc}/unlit" : 
+           "${InstLibExecDirGhc}/unlit" : 
 	   "${TopPwd}/ghc/utils/unlit/unlit" );
 # but this is re-set to "cat" (after options) if -cpp not seen
 $HsCpp = ( $INSTALLING ? 
 	   "${InstLibDirGhc}/hscpp" : 
 	   "${TopPwd}/ghc/utils/hscpp/hscpp" );
 $HsP   = ( $INSTALLING ? 
-	   "${InstLibDirGhc}/hsp" : 
+	   "${InstLibExecDirGhc}/hsp" : 
 	   "${TopPwd}/ghc/compiler/hsp" );
 $HsTagsHelp = 
 	 ( $INSTALLING ? 
-	   "${InstLibDirGhc}/hstags-help" : 
+	   "${InstLibExecDirGhc}/hstags-help" : 
 	   "${TopPwd}/ghc/utils/hstags/hstags-help" );
 
 $Verbose = 0;
diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index d0e2baac02..3698520478 100644
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -2,7 +2,7 @@
 # perl script expect the following variables to be prepended:
 #
 #  RAWCPP TMPDIR TOP_PWD
-#  libdir datadir INSTALLING
+#  libdir libexecdir datadir INSTALLING
 #  PROJECTVERSION SED 
 #
 # tries to work like mkdependC - capable of dealing with:
@@ -87,12 +87,14 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
 }
 
-$TopPwd	         = "${TOP_PWD}";
-$InstLibDirGhc   = "${libdir}";
-$InstHsLibDirGhc = "${libdir}/hslibs";
-$InstDataDirGhc  = "${datadir}";
+$TopPwd	           = "${TOP_PWD}";
+$InstLibDirGhc     = "${libdir}";
+$InstLibExecDirGhc = "${libexecdir}";
+$InstHsLibDirGhc   = "${libdir}/hslibs";
+$InstDataDirGhc    = "${datadir}";
 
-$Unlit = ($INSTALLING) ? "${InstLibDirGhc}/unlit" : "${TopPwd}/ghc/utils/unlit/unlit";
+$Unlit = ($INSTALLING) ? "${InstLibExecDirGhc}/unlit" 
+		       : "${TopPwd}/ghc/utils/unlit/unlit";
 
 $Begin_magic_str = "# DO NOT DELETE: Beginning of Haskell dependencies\n";
 $End_magic_str = "# DO NOT DELETE: End of Haskell dependencies\n";
diff --git a/ghc/utils/parallel/Makefile b/ghc/utils/parallel/Makefile
index bd9df22b33..b2ebf84c45 100644
--- a/ghc/utils/parallel/Makefile
+++ b/ghc/utils/parallel/Makefile
@@ -35,7 +35,18 @@ $(BASH_PROGS) :
 	@cat $@.bash >> $@
 	@chmod a+x $@
 
-INSTALL_PROGS += $(BASH_PROGS) $(PERL_PROGS)
-CLEAN_FILES   += $(BASH_PROGS) $(PERL_PROGS)
+#
+# You'll only get this with Parallel Haskell or 
+# GranSim..
+#
+ifeq "$(BuildingParallel)" "YES"
+INSTALL_SCRIPTS += $(BASH_PROGS) $(PERL_PROGS)
+else
+ifeq "$(BuildingGranSim)" "YES"
+INSTALL_SCRIPTS += $(BASH_PROGS) $(PERL_PROGS)
+endif
+endif
+
+CLEAN_FILES     += $(BASH_PROGS) $(PERL_PROGS)
 
 include $(TOP)/mk/target.mk