From: rrt <unknown>
Date: Mon, 29 Oct 2001 12:00:06 +0000 (+0000)
Subject: [project @ 2001-10-29 12:00:06 by rrt]
X-Git-Tag: Approximately_9120_patches~684
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f41ac4fd7193a0a4f27bd40223ab9f22f70dcd78;p=ghc-hetmet.git

[project @ 2001-10-29 12:00:06 by rrt]
Set libdir to prefix on Windows only. Windows install paths are
currently different from those used under Unix, and it's probably best
to change the layout of the InstallShield to match Unix in the long
term. For now, just Make It Work.
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2f52bad..02435e8 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -456,7 +456,11 @@ datadir			= @datadir@
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 libdir			= @libdir@
+else
+libdir                  = @prefix@
+endif
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
@@ -468,8 +472,10 @@ mandir			= @mandir@
 # override libdir and datadir to put project-specific stuff in
 # a subdirectory with the version number included.
 #
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 libdir     := $(if $(ProjectNameShort),$(libdir)/$(ProjectNameShort)-$(ProjectVersion),$(libdir))
 datadir    := $(if $(ProjectNameShort),$(datadir)/$(ProjectNameShort)-$(ProjectVersion),$(datadir))
+endif
 
 # 
 # Default values for most of the above are only set if