Merge branch 'ct/autoconf-htmldir'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:28:37 +0000 (15:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:28:38 +0000 (15:28 -0800)
commit1d321b5ab32e333e082d803c4edcc0787a396ffa
tree561460e6e1fb9b0dbde8db0a61105d5eb383207d
parenta923c314aa55ed5d5fba431d5db34e442a017a09
parentfc1c5415d69dd7997d20b5a9bdb204d3ee12ed08
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
config.mak.in