From: Jiang Xin Date: Tue, 19 Feb 2013 11:23:29 +0000 (+0800) Subject: Bugfix: undefined htmldir in config.mak.autogen X-Git-Tag: v1.8.2-rc1~6^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55d9bf0aa8428463da2d810024ab32d176be4d65;p=git-core%2Fgit.git 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= After the installation, all the html documents will copy to rootdir (/), and: $ git --html-path $ git help -w something fatal: '': 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 Signed-off-by: Junio C Hamano --- diff --git a/config.mak.in b/config.mak.in index 77715caa9..49619428d 100644 --- a/config.mak.in +++ b/config.mak.in @@ -9,6 +9,7 @@ CC_LD_DYNPATH = @CC_LD_DYNPATH@ AR = @AR@ TAR = @TAR@ DIFF = @DIFF@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources TCLTK_PATH = @TCLTK_PATH@ @@ -19,6 +20,7 @@ gitexecdir = @libexecdir@/git-core datarootdir = @datarootdir@ template_dir = @datadir@/git-core/templates sysconfdir = @sysconfdir@ +docdir = @docdir@ mandir = @mandir@ htmldir = @htmldir@