mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
Merge branch 'kk/maint-prefix-in-config-mak'
* kk/maint-prefix-in-config-mak: Honor $(prefix) set in config.mak* when defining ETC_GIT* Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
This commit is contained in:
commit
8cee0f1d8a
1 changed files with 9 additions and 9 deletions
18
Makefile
18
Makefile
|
@ -274,8 +274,7 @@ STRIP ?= strip
|
|||
# mandir
|
||||
# infodir
|
||||
# htmldir
|
||||
# ETC_GITCONFIG (but not sysconfdir)
|
||||
# ETC_GITATTRIBUTES
|
||||
# sysconfdir
|
||||
# can be specified as a relative path some/where/else;
|
||||
# this is interpreted as relative to $(prefix) and "git" at
|
||||
# runtime figures out where they are based on the path to the executable.
|
||||
|
@ -291,15 +290,8 @@ sharedir = $(prefix)/share
|
|||
gitwebdir = $(sharedir)/gitweb
|
||||
template_dir = share/git-core/templates
|
||||
htmldir = share/doc/git-doc
|
||||
ifeq ($(prefix),/usr)
|
||||
sysconfdir = /etc
|
||||
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
||||
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
|
||||
else
|
||||
sysconfdir = $(prefix)/etc
|
||||
ETC_GITCONFIG = etc/gitconfig
|
||||
ETC_GITATTRIBUTES = etc/gitattributes
|
||||
endif
|
||||
lib = lib
|
||||
# DESTDIR=
|
||||
pathsep = :
|
||||
|
@ -1195,6 +1187,14 @@ endif
|
|||
-include config.mak.autogen
|
||||
-include config.mak
|
||||
|
||||
ifndef sysconfdir
|
||||
ifeq ($(prefix),/usr)
|
||||
sysconfdir = /etc
|
||||
else
|
||||
sysconfdir = etc
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef CHECK_HEADER_DEPENDENCIES
|
||||
COMPUTE_HEADER_DEPENDENCIES =
|
||||
USE_COMPUTED_HEADER_DEPENDENCIES =
|
||||
|
|
Loading…
Reference in a new issue