put the inplace GHC in stageN-inplace/ghc instead of stageN-inplace/bin/ghc

just saves a bit of typing

diff --git a/ghc/Makefile b/ghc/Makefile
index 806db1a..88b4dc0 100644 (file)
--- 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 3391f17..ac704a3 100644 (file)
--- 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