[project @ 2001-06-27 15:26:56 by chak]

And removed bin/ from $(GHCBIN) again *sigh*

[Yeah, I tested the previous commit before committing and it worked for me
due to a not-clean build tree.]

I don't think that it is a good idea to redefine execlibdir in
`ghc/mk/boilerplate.mk'.  Makes already complicated scripts even harder to
understand...

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

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