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 fc1c5415d69d (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 <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jiang Xin committed Feb 19, 2013 at 19:23 UTC 55d9bf0aa8428463da2d810024ab32d176be4d65
1 file changed +2
config.mak.in
+2
@@ -9,6 +9,7 @@ CC_LD_DYNPATH = @CC_LD_DYNPATH@
9 AR = @AR@
10 TAR = @TAR@
11 DIFF = @DIFF@
12 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
13 #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
14 TCLTK_PATH = @TCLTK_PATH@
15
@@ -19,6 +20,7 @@ gitexecdir = @libexecdir@/git-core
20 datarootdir = @datarootdir@
21 template_dir = @datadir@/git-core/templates
22 sysconfdir = @sysconfdir@
23 +docdir = @docdir@
24
25 mandir = @mandir@
26 htmldir = @htmldir@