Merge branch 'ct/autoconf-htmldir'

The autoconf subsystem passed --mandir down to generated
config.mak.autogen but forgot to do the same for --htmldir.

* ct/autoconf-htmldir:
Honor configure's htmldir switch

diff --git a/config.mak.in b/config.mak.in
index e8a9bb4682a239762bc7c4946b19f58353b80baf..d7c49cd8f3333f8ccf434ea494453656c2e573ac 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -19,6 +19,7 @@ template_dir = @datadir@/git-core/templates
 sysconfdir = @sysconfdir@
 
 mandir = @mandir@
+htmldir = @htmldir@
 
 srcdir = @srcdir@
 VPATH = @srcdir@