Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Feb 25, 2013
2 parents 6368a71 + 55d9bf0 commit a2b109f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config.mak.in
Expand Up @@ -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@
Expand All @@ -17,6 +18,7 @@ gitexecdir = @libexecdir@/git-core
datarootdir = @datarootdir@
template_dir = @datadir@/git-core/templates
sysconfdir = @sysconfdir@
docdir = @docdir@

mandir = @mandir@
htmldir = @htmldir@
Expand Down

0 comments on commit a2b109f

Please sign in to comment.