Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 55d9bf0

Browse files
jiangxingitster
authored andcommitted
Bugfix: undefined htmldir in config.mak.autogen
Html documents will be installed to root dir (/) no matter what prefix is set, if run these commands before `make` and `make install-html`: $ make configure $ ./configure --prefix=<PREFIX> After the installation, all the html documents will copy to rootdir (/), and: $ git --html-path <PREFIX> $ git help -w something fatal: '<PREFIX>': not a documentation directory. This is because the variable "htmldir" points to a undefined variable "$(docdir)" in file "config.mak.autogen", which is generated by running `./configure`. By default $(docdir) generated by configure is supposed be set this way: datarootdir='${prefix}/share' htmldir='${docdir}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' but since fc1c541 (Honor configure's htmldir switch, 2013-02-02), we only set and export htmldir without doing so for PACKAGE_TARNAME (which is set to 'git' by the configure script). Add the required two variables "PACKAGE_TARNAME" and "docdir" to file "config.mak.in" will work this issue around. Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fc1c541 commit 55d9bf0

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

config.mak.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CC_LD_DYNPATH = @CC_LD_DYNPATH@
99
AR = @AR@
1010
TAR = @TAR@
1111
DIFF = @DIFF@
12+
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1213
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
1314
TCLTK_PATH = @TCLTK_PATH@
1415

@@ -19,6 +20,7 @@ gitexecdir = @libexecdir@/git-core
1920
datarootdir = @datarootdir@
2021
template_dir = @datadir@/git-core/templates
2122
sysconfdir = @sysconfdir@
23+
docdir = @docdir@
2224

2325
mandir = @mandir@
2426
htmldir = @htmldir@

0 commit comments

Comments
 (0)