diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:27:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:27:04 -0800 |
| commit | a2b109f27575a8b05a627b7e6842bd81a62ba991 (patch) | |
| tree | c8fb65f0698821a4176480b760e55c68ebc172a4 /config.mak.in | |
| parent | 6368a71b81427fbc0a7b004c6c1446ac09c64646 (diff) | |
| parent | 55d9bf0aa8428463da2d810024ab32d176be4d65 (diff) | |
| download | git-a2b109f27575a8b05a627b7e6842bd81a62ba991.tar.gz | |
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
Diffstat (limited to 'config.mak.in')
| -rw-r--r-- | config.mak.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in index d7c49cd8f3..fa02bdd82a 100644 --- a/config.mak.in +++ b/config.mak.in @@ -8,6 +8,7 @@ LDFLAGS = @LDFLAGS@ AR = @AR@ TAR = @TAR@ DIFF = @DIFF@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources prefix = @prefix@ @@ -17,6 +18,7 @@ gitexecdir = @libexecdir@/git-core datarootdir = @datarootdir@ template_dir = @datadir@/git-core/templates sysconfdir = @sysconfdir@ +docdir = @docdir@ mandir = @mandir@ htmldir = @htmldir@ |