Merge branch 'ct/autoconf-htmldir'

An earlier change to config.mak.autogen broke a build driven by the
./configure script when --htmldir is not specified on the command
line of ./configure.

* ct/autoconf-htmldir:
Bugfix: undefined htmldir in config.mak.autogen

diff --combined config.mak.in
index d7c49cd8f3333f8ccf434ea494453656c2e573ac,49619428dcd77a73d6b4603cdb9bf2eaf7ccb539..fa02bdd82ada7c45b2c666438aa2df9407f5c1af
--- 1/config.mak.in
--- 2/config.mak.in
+++ b/config.mak.in
@@@ -5,10 -5,13 +5,11 @@@ CC = @CC
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -CC_LD_DYNPATH = @CC_LD_DYNPATH@
  AR = @AR@
  TAR = @TAR@
  DIFF = @DIFF@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
  #INSTALL = @INSTALL@          # needs install-sh or install.sh in sources
 -TCLTK_PATH = @TCLTK_PATH@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
@@@ -17,6 -20,7 +18,7 @@@ gitexecdir = @libexecdir@/git-cor
  datarootdir = @datarootdir@
  template_dir = @datadir@/git-core/templates
  sysconfdir = @sysconfdir@
+ docdir = @docdir@
  
  mandir = @mandir@
  htmldir = @htmldir@
@@@ -26,3 -30,50 +28,3 @@@ VPATH = @srcdir
  
  export exec_prefix mandir
  export srcdir VPATH
 -
 -NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 -NO_OPENSSL=@NO_OPENSSL@
 -NO_CURL=@NO_CURL@
 -NO_EXPAT=@NO_EXPAT@
 -NO_LIBGEN_H=@NO_LIBGEN_H@
 -HAVE_PATHS_H=@HAVE_PATHS_H@
 -HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@
 -NO_GETTEXT=@NO_GETTEXT@
 -LIBC_CONTAINS_LIBINTL=@LIBC_CONTAINS_LIBINTL@
 -NEEDS_LIBICONV=@NEEDS_LIBICONV@
 -NEEDS_SOCKET=@NEEDS_SOCKET@
 -NEEDS_RESOLV=@NEEDS_RESOLV@
 -NEEDS_LIBGEN=@NEEDS_LIBGEN@
 -NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
 -NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
 -NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
 -NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
 -NO_IPV6=@NO_IPV6@
 -NO_HSTRERROR=@NO_HSTRERROR@
 -NO_STRCASESTR=@NO_STRCASESTR@
 -NO_STRTOK_R=@NO_STRTOK_R@
 -NO_FNMATCH=@NO_FNMATCH@
 -NO_FNMATCH_CASEFOLD=@NO_FNMATCH_CASEFOLD@
 -NO_MEMMEM=@NO_MEMMEM@
 -NO_STRLCPY=@NO_STRLCPY@
 -NO_UINTMAX_T=@NO_UINTMAX_T@
 -NO_STRTOUMAX=@NO_STRTOUMAX@
 -NO_SETENV=@NO_SETENV@
 -NO_UNSETENV=@NO_UNSETENV@
 -NO_MKDTEMP=@NO_MKDTEMP@
 -NO_MKSTEMPS=@NO_MKSTEMPS@
 -NO_INET_NTOP=@NO_INET_NTOP@
 -NO_INET_PTON=@NO_INET_PTON@
 -NO_ICONV=@NO_ICONV@
 -OLD_ICONV=@OLD_ICONV@
 -NO_REGEX=@NO_REGEX@
 -USE_LIBPCRE=@USE_LIBPCRE@
 -NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
 -INLINE=@INLINE@
 -SOCKLEN_T=@SOCKLEN_T@
 -FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
 -SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
 -NO_PTHREADS=@NO_PTHREADS@
 -PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 -PTHREAD_LIBS=@PTHREAD_LIBS@
 -CHARSET_LIB=@CHARSET_LIB@