[project @ 2001-03-26 22:42:41 by qrczak]

Fix installation of the compiler binary and its drivers.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3ebdf2a..83b581e 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.145 2001/03/24 14:58:04 simonmar Exp $
+# $Id: Makefile,v 1.146 2001/03/26 22:42:41 qrczak Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -23,8 +23,6 @@ else
 HS_PROG=ghc-$(ProjectVersion)
 endif
 
-LINK = ghc
-
 # -----------------------------------------------------------------------------
 # Create compiler configuration
 
@@ -303,7 +301,7 @@ CLEAN_FILES += ghc-inplace
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
-INSTALL_PROGS += $(HS_PROG)
+INSTALL_LIBEXECS += $(HS_PROG)
 
 #-----------------------------------------------------------------------------
 #              clean

diff --git a/ghc/driver/ghc/Makefile b/ghc/driver/ghc/Makefile
index 557ef68..40e733a 100644 (file)
--- a/ghc/driver/ghc/Makefile
+++ b/ghc/driver/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2001/03/26 16:51:26 simonmar Exp $
+# $Id: Makefile,v 1.2 2001/03/26 22:42:42 qrczak Exp $
 #
 
 TOP=../..
@@ -22,7 +22,7 @@ INTERP                  = $(SHELL)
 TOPDIROPT        = -B$(GHCLIB)
 SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
 LINK             = ghc
-INSTALL_SCRIPTS  += $(SCRIPT_PROG) ghc
+INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 
 # -----------------------------------------------------------------------------
 

diff --git a/ghc/driver/ghci/Makefile b/ghc/driver/ghci/Makefile
index e4caf48..22f4735 100644 (file)
--- a/ghc/driver/ghci/Makefile
+++ b/ghc/driver/ghci/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2001/03/26 16:51:27 simonmar Exp $
+# $Id: Makefile,v 1.2 2001/03/26 22:42:42 qrczak Exp $
 #
 
 TOP=../..
@@ -13,10 +13,10 @@ INSTALLING=1
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
-GHCBIN=$$\"\"libdir/ghc
+GHCBIN=$$\"\"libdir/ghc-$(ProjectVersion)
 GHCLIB=$$\"\"libdir
 else
-GHCBIN=$(libdir)/ghc
+GHCBIN=$(libdir)/ghc-$(ProjectVersion)
 GHCLIB=$(libdir)
 endif # BIN_DIST
 else
@@ -30,7 +30,7 @@ INPLACE_SCRIPT_PROG    = ghci-inplace
 SCRIPT_OBJS      = ghci.sh
 INTERP           = $(SHELL)
 SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
-INSTALL_SCRIPTS  += $(SCRIPT_PROG) ghc5
+INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 TOPDIROPT        = -B$(GHCLIB)
 
 ifeq "$(INSTALLING)" "1"