diff options
| author | Kirill Smelkov <kirr@mns.spb.ru> | 2013-03-05 16:43:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-05 08:56:25 -0800 |
| commit | b4eead95e0c207e4f0492298d795674da119f684 (patch) | |
| tree | bc9eed05a6f016c10a3e7f63e5259267aa26c378 /config.mak.in | |
| parent | c09d62f5635928ab20909cb650b621f7520b56fb (diff) | |
| download | git-b4eead95e0c207e4f0492298d795674da119f684.tar.gz | |
Fix `make install` when configured with autoconf
Commit d8cf908c (config.mak.in: remove unused definitions) removed
exec_prefix = @exec_prefix@
from config.mak.in, because nobody directly used ${exec_prefix}, but
overlooked that other autoconf definitions could indirectly expand that
variable.
For example the following snippet from config.mak.in
prefix = @prefix@
bindir = @bindir@
gitexecdir = @libexecdir@/git-core
datarootdir = @datarootdir@
template_dir = @datadir@/git-core/templates
sysconfdir = @sysconfdir@
is expanded to
prefix = /home/kirr/local/git
bindir = ${exec_prefix}/bin <-- HERE
gitexecdir = ${exec_prefix}/libexec/git-core <--
datarootdir = ${prefix}/share
template_dir = ${datarootdir}/git-core/templates
sysconfdir = ${prefix}/etc
on my system, after `configure --prefix=$HOME/local/git`
and withot exec_prefix being defined there I get an error on
install:
install -d -m 755 '/bin'
install -d -m 755 '/libexec/git-core'
install: cannot create directory `/libexec': Permission denied
Makefile:2292: recipe for target `install' failed
Fix it.
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.in')
| -rw-r--r-- | config.mak.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in index 947ca5776a..515a4aa820 100644 --- a/config.mak.in +++ b/config.mak.in @@ -13,6 +13,7 @@ DIFF = @DIFF@ TCLTK_PATH = @TCLTK_PATH@ prefix = @prefix@ +exec_prefix = @exec_prefix@ bindir = @bindir@ gitexecdir = @libexecdir@/git-core datarootdir = @datarootdir@ |