From a549d46404a69374ebe9d07a94006e8bd4f53ad5 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 18 Sep 2007 20:12:49 +0000 Subject: [PATCH] Give Windows its own definitions of docdir (and htmldir etc) --- mk/config.mk.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 640f33e..106d7aa 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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) -- 1.7.10.4