[project @ 2001-06-27 13:42:32 by chak]

Added bin/ to $(GHCBIN)

diff --git a/ghc/driver/ghc/Makefile b/ghc/driver/ghc/Makefile
index e0648e2..7283d96 100644 (file)
--- a/ghc/driver/ghc/Makefile
+++ b/ghc/driver/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 2001/06/23 12:54:18 panne Exp $
+# $Id: Makefile,v 1.4 2001/06/27 13:42:32 chak Exp $
 #
 
 TOP=../..
@@ -9,10 +9,10 @@ include $(TOP)/mk/boilerplate.mk
 # ghc script
 
 ifeq "$(BIN_DIST)"   "1"
-GHCBIN=$$\"\"libexecdir/ghc-$(ProjectVersion)
+GHCBIN=$$\"\"libexecdir/bin/ghc-$(ProjectVersion)
 GHCLIB=$$\"\"libdir
 else
-GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)
+GHCBIN=$(libexecdir)/bin/ghc-$(ProjectVersion)
 GHCLIB=$(libdir)
 endif # BIN_DIST
 

diff --git a/ghc/driver/ghci/Makefile b/ghc/driver/ghci/Makefile
index 09d3e33..5b3c93b 100644 (file)
--- a/ghc/driver/ghci/Makefile
+++ b/ghc/driver/ghci/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.4 2001/06/23 12:54:18 panne Exp $
+# $Id: Makefile,v 1.5 2001/06/27 13:42:32 chak Exp $
 #
 
 TOP=../..
@@ -13,10 +13,10 @@ INSTALLING=1
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
-GHCBIN=$$\"\"libexecdir/ghc-$(ProjectVersion)
+GHCBIN=$$\"\"libexecdir/bin/ghc-$(ProjectVersion)
 GHCLIB=$$\"\"libdir
 else
-GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)
+GHCBIN=$(libexecdir)/bin/ghc-$(ProjectVersion)
 GHCLIB=$(libdir)
 endif # BIN_DIST
 else