[PATCH] Bugfix: undefined htmldir in config.mak.autogen
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- Feb 19, 2013, 11:23 UTC
- Message-ID
- <1be0a520b99fbfecd7255c1d26753015612856b3.1361272864.git.worldhello.net@gmail.com>
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`. This bug comes from commit fc1c541 (Honor configure's htmldir switch), since v1.8.1.3-537-g1d321.
Add the required two variables "PACKAGE_TARNAME" and "docdir" to file "config.mak.in" will resolve this problem.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- config.mak.in | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/config.mak.in b/config.mak.in index d7c49..fa02bd 100644 --- a/config.mak.in +++ b/config.mak.in @@ -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@ @@ -17,6 +18,7 @@ gitexecdir = @libexecdir@/git-core datarootdir = @datarootdir@ template_dir = @datadir@/git-core/templates sysconfdir = @sysconfdir@ +docdir = @docdir@ mandir = @mandir@ htmldir = @htmldir@
-- 1.8.2.rc0.18.g63af42f.dirty