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

1  2 
config.mak.in

diff --cc config.mak.in
Simple merge