diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-07-24 08:09:51 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-07-24 08:09:51 +0000 |
| commit | 592766aac81d0889b56d4957382bbc6b7dad2d4b (patch) | |
| tree | 2e7682f767eaacac48727ae83a97845b2e5dccd3 | |
| parent | 228c19b0e8a5af4baa51e720f23202422b22ad10 (diff) | |
| download | haskell-592766aac81d0889b56d4957382bbc6b7dad2d4b.tar.gz | |
put the inplace GHC in stageN-inplace/ghc instead of stageN-inplace/bin/ghc
just saves a bit of typing
| -rw-r--r-- | ghc/Makefile | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index 806db1a0a7..88b4dc082f 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -85,7 +85,7 @@ build.stage.%: $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \ - '$$prefix/bin' \ + '$$prefix' \ '$(INPLACE_DATA_DIR)' \ '$$prefix/libexec' \ '$$prefix/dynlib' \ diff --git a/mk/config.mk.in b/mk/config.mk.in index 3391f1788c..ac704a342b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -868,9 +868,9 @@ NHC = @NHC@ # tree). We can refer to "this ghc" as $(GHC_INPLACE): GHC_INPLACE = $(GHC_STAGE1) -GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/bin/ghc -GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/bin/ghc -GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/bin/ghc +GHC_STAGE1 = $(GHC_COMPILER_DIR_ABS)/stage1-inplace/ghc +GHC_STAGE2 = $(GHC_COMPILER_DIR_ABS)/stage2-inplace/ghc +GHC_STAGE3 = $(GHC_COMPILER_DIR_ABS)/stage3-inplace/ghc # XXX All those used to have -no-user-package-conf, but then we can't # pass them to Cabal |