diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-08 15:28:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-08 15:28:38 -0800 |
| commit | 1d321b5ab32e333e082d803c4edcc0787a396ffa (patch) | |
| tree | 561460e6e1fb9b0dbde8db0a61105d5eb383207d /config.mak.in | |
| parent | a923c314aa55ed5d5fba431d5db34e442a017a09 (diff) | |
| parent | fc1c5415d69dd7997d20b5a9bdb204d3ee12ed08 (diff) | |
| download | git-1d321b5ab32e333e082d803c4edcc0787a396ffa.tar.gz | |
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
Diffstat (limited to 'config.mak.in')
| -rw-r--r-- | config.mak.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in index e8a9bb4682..d7c49cd8f3 100644 --- a/config.mak.in +++ b/config.mak.in @@ -19,6 +19,7 @@ template_dir = @datadir@/git-core/templates sysconfdir = @sysconfdir@ mandir = @mandir@ +htmldir = @htmldir@ srcdir = @srcdir@ VPATH = @srcdir@ |