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 --cc config.mak.in
index d7c49cd8f3333f8ccf434ea494453656c2e573ac,49619428dcd77a73d6b4603cdb9bf2eaf7ccb539..fa02bdd82ada7c45b2c666438aa2df9407f5c1af
--- 1/config.mak.in
--- 2/config.mak.in
+++ b/config.mak.in
@@@ -8,7 -8,10 +8,8 @@@ LDFLAGS = @LDFLAGS
  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@