From d668d368efdb8ea54dab178e6cc6178b8148e7cf Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 31 Aug 2007 17:39:03 +0000 Subject: [PATCH] Don't use the --docdir etc that autoconf provides Older autoconfs (<2.60?) don't understand them. --- mk/config.mk.in | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 16109bf..249da9e 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -550,11 +550,21 @@ datadir = $(datadir0)/ghc-$(ProjectVersion) endif # Windows headerdir = $(libdir)/include -docdir = @docdir@ -htmldir = @htmldir@ -dvidir = @dvidir@ -pdfdir = @pdfdir@ -psdir = @psdir@ + +# 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. + +#docdir = @docdir@ +#htmldir = @htmldir@ +#dvidir = @dvidir@ +#pdfdir = @pdfdir@ +#psdir = @psdir@ + +docdir = $(datarootdir)/doc/ghc +htmldir = $(docdir) +dvidir = $(docdir) +pdfdir = $(docdir) +psdir = $(docdir) # Default place for putting interface files is $(libdir) # (overriden for packages in package.mk) -- 1.7.10.4