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

oops, revert accidental commit

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 2daf310..4453b0c 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.37 2001/09/10 12:57:25 simonmar Exp $
+# $Id: paths.mk,v 1.38 2001/09/10 12:57:59 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -7,6 +7,12 @@
 #-----------------------------------------------------------------------------
 # 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
@@ -39,11 +45,8 @@ 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"