[project @ 2001-09-10 12:53:21 by simonmar]

Remove the "extra-bin" subdirectory from $(libexecdir), since there
are too many assumptions in the tree that $(libexecdir) == $(libdir)
(at the moment, binary dists are fairly well broken).

Reuben has promised to track the change in the Windows distribution.

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index ffa77e9..4bd3284 100644 (file)
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -221,7 +221,7 @@ initSysTools minusB_args
                -- NB: top_dir is assumed to be in standard Unix format '/' separated
 
        ; let installed, installed_bin :: FilePath -> FilePath
-              installed_bin pgm   =  pgmPath (top_dir `slash` "extra-bin") pgm
+              installed_bin pgm   =  pgmPath top_dir pgm
              installed     file  =  pgmPath top_dir file
              inplace dir   pgm   =  pgmPath (top_dir `slash` dir) pgm
 

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index ec155f0..8d7b09f 100644 (file)
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -31,9 +31,3 @@ TOP:=$(GHC_TOP)
 -include $(TOP)/mk/paths.mk
 -include $(TOP)/mk/opts.mk
 -include $(TOP)/mk/suffix.mk
-
-# -----------------------------------------------------------------
-# Override $(libexecdir): we like our binaries in a subdirectory
-# of $(libdir).
-
-libexecdir := $(libdir)/extra-bin