From f35b012e13cea7815831973fbdb6b5e974973cd3 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 17 Sep 2009 12:19:21 +0000 Subject: [PATCH] fix install on Windows --- mk/config.mk.in | 4 +++- mk/install.mk.in | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) 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 #----------------------------------------------------------------------------- -- 1.7.10.4