From b3cc4468b5f0939fd0e791c9c5d68070a343c111 Mon Sep 17 00:00:00 2001 From: simonmar Date: Mon, 10 Sep 2001 12:57:59 +0000 Subject: [PATCH] [project @ 2001-09-10 12:57:59 by simonmar] oops, revert accidental commit --- ghc/mk/paths.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk index 2daf310..4453b0c 100644 --- 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" -- 1.7.10.4