From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:27:04 +0000 (-0800)
Subject: Merge branch 'ct/autoconf-htmldir'
X-Git-Tag: v1.8.2-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2b109f27575a8b05a627b7e6842bd81a62ba991;p=thirdparty%2Fgit.git

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
---

a2b109f27575a8b05a627b7e6842bd81a62ba991
diff --cc config.mak.in
index d7c49cd8f3,49619428dc..fa02bdd82a
--- a/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@