X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=02e02bca4689f92b740eaef399624b5cfe88e82a;hb=cf2ee54939510b1a64ad99ca7d00aeb8a862c06b;hp=640f33e45b9e1d7b71a512aefe8be5e2b1e1b939;hpb=e05f9de137269701df667b69d741dfae616694f7;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 640f33e..02e02bc 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -561,7 +561,7 @@ libdir0         := @libdir@
 includedir      := @includedir@
 mandir          := @mandir@
 
-ifeq "$(Windows)" "YES"
+ifeq "$(RelocatableBuild)" "YES"
 
 # Hack: our directory layouts tend to be different on Windows, so
 # hack around configure's bogus assumptions here.
@@ -569,6 +569,12 @@ datarootdir := $(prefix)
 datadir     := $(prefix)
 libdir      := $(prefix)
 
+docdir    := $(prefix)/doc
+htmldir   := $(docdir)
+dvidir    := $(docdir)
+pdfdir    := $(docdir)
+psdir     := $(docdir)
+
 else
 
 # Unix: override libdir and datadir to put ghc-specific stuff in
@@ -577,10 +583,6 @@ datarootdir := $(datadir0)
 datadir     := $(datadir0)/ghc-$(ProjectVersion)
 libdir      := $(libdir0)/ghc-$(ProjectVersion)
 
-endif # Windows
-
-headerdir := $(libdir)/include
-
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.
 
@@ -596,6 +598,10 @@ dvidir    := $(docdir)
 pdfdir    := $(docdir)
 psdir     := $(docdir)
 
+endif # Windows
+
+headerdir := $(libdir)/include
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
 ifacedir		= $(libdir)