Merge branch 'ct/autoconf-htmldir' into next
commitbba4f8c0805b2013b74e55d3b7af0198ec45da2d
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2013 22:43:01 +0000 (5 14:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2013 22:43:02 +0000 (5 14:43 -0800)
tree63c62ca5325eee9439a7ba7e46f5346799741d28
parent157812c715e302bda6c9766d12a401f40ffbabcc
parentfc1c5415d69dd7997d20b5a9bdb204d3ee12ed08
Merge branch 'ct/autoconf-htmldir' into next

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