X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=249da9efe205d8f13196da6b2a67f7bfd8b4e9a8;hb=395726c5f8e77a01074e775e838658243e39e21c;hp=5b89981c2aaed2b86213bc3ad1e7b231dac266dd;hpb=18e4fea8fcd804d0f164d06aec9f96bb9435a338;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5b89981..249da9e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -504,6 +504,9 @@ FPTOOLS_TOP_ABS		= @hardtop@
 # The platform specific version of 'hardtop'.
 FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
+# This gets used in the default docdir
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+
 BIN_DIST_NAME=ghc-$(ProjectVersion)
 BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
@@ -548,6 +551,21 @@ 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.
+
+#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)
 ifacedir		= $(libdir)