diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2013-02-19 19:23:29 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-19 15:27:08 -0800 |
| commit | 55d9bf0aa8428463da2d810024ab32d176be4d65 (patch) | |
| tree | 63c4a8308aaa8166755241bc272b15652196f1d5 | |
| parent | fc1c5415d69dd7997d20b5a9bdb204d3ee12ed08 (diff) | |
| download | git-55d9bf0aa8428463da2d810024ab32d176be4d65.tar.gz | |
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>
| -rw-r--r-- | config.mak.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in index 77715caa93..49619428dc 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@ |