[project @ 2001-06-23 12:54:18 by panne]

Use libexecdir in scripts, not libdir
Note: hsc2hs has to be changed, too...

diff --git a/ghc/driver/ghc/Makefile b/ghc/driver/ghc/Makefile
index 40e733a..e0648e2 100644 (file)
--- a/ghc/driver/ghc/Makefile
+++ b/ghc/driver/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.2 2001/03/26 22:42:42 qrczak Exp $
+# $Id: Makefile,v 1.3 2001/06/23 12:54:18 panne Exp $
 #
 
 TOP=../..
@@ -9,10 +9,10 @@ include $(TOP)/mk/boilerplate.mk
 # ghc script
 
 ifeq "$(BIN_DIST)"   "1"
-GHCBIN=$$\"\"libdir/ghc-$(ProjectVersion)
+GHCBIN=$$\"\"libexecdir/ghc-$(ProjectVersion)
 GHCLIB=$$\"\"libdir
 else
-GHCBIN=$(libdir)/ghc-$(ProjectVersion)
+GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)
 GHCLIB=$(libdir)
 endif # BIN_DIST
 

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

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index e12187c..92ea134 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.7 2001/03/27 13:38:03 simonmar Exp $
+# $Id: Makefile,v 1.8 2001/06/23 12:54:18 panne Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -21,10 +21,10 @@ INSTALL_LIBEXECS = $(HS_PROG)
 
 ifeq "$(INSTALLING)" "1"
 ifeq "$(BIN_DIST)"   "1"
-GHCPKGBIN=$$\"\"libdir/$(HS_PROG)
+GHCPKGBIN=$$\"\"libexecdir/$(HS_PROG)
 PKGCONF=$$\"\"libdir/package.conf
 else
-GHCPKGBIN=$(libdir)/$(HS_PROG)
+GHCPKGBIN=$(libexecdir)/$(HS_PROG)
 PKGCONF=$(libdir)/package.conf
 endif # BIN_DIST
 else