Merge branch 'ct/autoconf-htmldir'
commita2b109f27575a8b05a627b7e6842bd81a62ba991
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:27:04 +0000 (25 08:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:27:04 +0000 (25 08:27 -0800)
treec8fb65f0698821a4176480b760e55c68ebc172a4
parent6368a71b81427fbc0a7b004c6c1446ac09c64646
parent55d9bf0aa8428463da2d810024ab32d176be4d65
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
config.mak.in