X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=249da9efe205d8f13196da6b2a67f7bfd8b4e9a8;hb=6fa4feaf2979419a6f6153ffa80c22a28f2f654f;hp=16109bfcaa5ca34663d031caee00a32ec19b966e;hpb=88aa9117c3bd185e96a0bdc2e935afe180c6decc;p=ghc-hetmet.git

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)