From: sewardj <unknown>
Date: Fri, 6 Apr 2001 16:15:39 +0000 (+0000)
Subject: [project @ 2001-04-06 16:15:39 by sewardj]
X-Git-Tag: Approximately_9120_patches~2182
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=77cdc77c6e522d550e60a2240eb698335d79d988

[project @ 2001-04-06 16:15:39 by sewardj]
Commit the following change:

> > Why the default libdir is /usr/local/lib
> > and not /usr/local/lib/ghc-<version>?
>
> Great question.  I end up running config with the likes of
> `--libdir=/usr/local/lib/ghc-5.0' every time, which gets to
> be annoying ;-)

I've been meaning to fix this for a while, but couldn't see a good way
to do it.  I found a (mildly-hacky) way to do it today: in
fptools/ghc, we override $(libdir) to be
$(libdir)/$(ProjectNameShort)-$(ProjectVersion), so everything inside
fptools/ghc will be installed in the subdirectory.  fptools/hslibs is
a bit more of a hack.
---

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index cd11165..b8cc529 100644
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -31,3 +31,9 @@ TOP:=$(GHC_TOP)
 -include $(TOP)/mk/version.mk
 include $(TOP)/mk/suffix.mk
 
+# -----------------------------------------------------------------
+# Override $(libdir) and $(datadir), so GHC stuff gets installed 
+# into a suitable subdirectory of $(libdir).
+
+libdir  := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
+datadir := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)