From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 17 Sep 2009 12:19:21 +0000 (+0000)
Subject: fix install on Windows
X-Git-Tag: 2009-11-15~306
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=f35b012e13cea7815831973fbdb6b5e974973cd3

fix install on Windows
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0b2300c..93b5555 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -26,7 +26,6 @@
 TOP		= @hardtop@
 
 include $(TOP)/mk/project.mk
-include $(TOP)/mk/install.mk
 
 ################################################################################
 #
@@ -192,6 +191,9 @@ else
 RelocatableBuild = NO
 endif
 
+# needs to be after $(RelocatableBuild) is set above
+include $(TOP)/mk/install.mk
+
 # When building bindists we set this to yes so that the binaries are as
 # portable as possible.
 BeConservative = NO
diff --git a/mk/install.mk.in b/mk/install.mk.in
index 863a598..3aed8b7 100644
--- a/mk/install.mk.in
+++ b/mk/install.mk.in
@@ -96,7 +96,8 @@ dvidir    = $(docdir)
 pdfdir    = $(docdir)
 psdir     = $(docdir)
 
-topdir = $(libdir)
+ghclibdir = $(libdir)
+ghcdocdir = $(datarootdir)/doc
 
 else
 
@@ -108,11 +109,11 @@ else
 # where package.conf is, so we just set it globally).
 #
 ghclibdir     = $(libdir)/ghc-$(ProjectVersion)
-ghclibexecdir = $(ghclibdir)
-topdir        = $(ghclibdir)
 ghcdocdir     = $(datarootdir)/doc/ghc
 endif
 
+ghclibexecdir = $(ghclibdir)
+topdir        = $(ghclibdir)
 ghcheaderdir  = $(ghclibdir)/include
 
 #-----------------------------------------------------------------------------