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
This commit is contained in:
commit
a2b109f275
@ -8,6 +8,7 @@ LDFLAGS = @LDFLAGS@
|
|||||||
AR = @AR@
|
AR = @AR@
|
||||||
TAR = @TAR@
|
TAR = @TAR@
|
||||||
DIFF = @DIFF@
|
DIFF = @DIFF@
|
||||||
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||||
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
|
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
|
||||||
|
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
@ -17,6 +18,7 @@ gitexecdir = @libexecdir@/git-core
|
|||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
template_dir = @datadir@/git-core/templates
|
template_dir = @datadir@/git-core/templates
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
htmldir = @htmldir@
|
htmldir = @htmldir@
|
||||||
|
Loading…
Reference in New Issue
Block a user