[project @ 2001-06-28 09:49:40 by simonmar]

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 05e77e2..c1b736a 100644 (file)
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -32,9 +32,7 @@ TOP:=$(GHC_TOP)
 -include $(TOP)/mk/suffix.mk
 
 # -----------------------------------------------------------------
-# Override $(libdir) and $(datadir), so GHC stuff gets installed 
-# into a suitable subdirectory of $(libdir).
+# Override $(libexecdir): we like our binaries in a subdirectory
+# of $(libdir).
 
-libdir     := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
 libexecdir := $(libdir)/bin
-datadir    := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c1e77c6..dfa9a9b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -434,16 +434,16 @@ FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 prefix                 = @prefix@
 exec_prefix            = @exec_prefix@
 bindir                 = @bindir@
-datadir                        = @datadir@
+datadir                        = @datadir@/$(ProjectNameShort)-$(ProjectVersion)
+
 #sysconfdir            = @datadir@
 #sharedstatedir                = @sharedstatedir@
 #localstatedir         = @localstatedir@
-libdir                 = @libdir@
+libdir                 = @libdir@/$(ProjectNameShort)-$(ProjectVersion)
 includedir             = @includedir@
 oldincludedir          = @oldincludedir@
 mandir                 = @mandir@
 
-#UNUSED, see below: libexecdir              = @libexecdir@
 #UNUSED:infodir                = @infodir@
 #UNUSED:srcdir          = @srcdir@