[project @ 2001-09-10 12:57:25 by simonmar]

good riddance

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 0dc8604..2daf310 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.36 2001/07/31 14:31:28 simonmar Exp $
+# $Id: paths.mk,v 1.37 2001/09/10 12:57:25 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -7,12 +7,6 @@
 #-----------------------------------------------------------------------------
 # HsTags
 
-ifdef UseInstalledUtils
-HSTAGS                 = hstags
-else
-HSTAGS                 = $(HSTAGS_DIR)/hstags
-HSTAGS_DIR             = $(GHC_UTILS_DIR)/hstags
-endif
 
 #-----------------------------------------------------------------------------
 # Extra things ``only for'' for the ghc project
@@ -45,8 +39,11 @@ GHC_MANGLER          = ghc-asm
 GHC_SPLIT_DIR          = $(GHC_DRIVER_DIR)/split
 GHC_SPLIT              = ghc-split
 
-GHC_SYSMAN             = $(GHC_RUNTIME_DIR)/parallel/SysMan
 GHC_SYSMAN_DIR                 = $(GHC_RUNTIME_DIR)/parallel
+GHC_SYSMAN             = SysMan
+
+GHC_HSTAGS_DIR                 = $(GHC_UTILS_DIR)/hstags
+GHC_HSTAGS             = hstags
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 

diff --git a/ghc/mk/post-inplace-script b/ghc/mk/post-inplace-script
deleted file mode 100644 (file)
index 2fae09f..0000000
--- a/ghc/mk/post-inplace-script
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# $1 is $(platform)
-# $2 is root of the unpacked tarfile tree
-# $3 is $(package)-$(version) ie ghc-4.11 
-
-echo POST_INPLACE_SCRIPT $1 $2 $3
-
-bin/$1/pkgconf install "$1" "" "YES" "" "$2/lib/$1" "$2/lib/$1" "$2/lib/$1" "" "$2/lib/$1/include" "" > $2/lib/$1/package.conf