Commit f35b012e authored by Simon Marlow's avatar Simon Marlow

fix install on Windows

parent f69a0fe9
......@@ -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
......
......@@ -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
#-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment