global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 11:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kk/maint-prefix-in-config-mak' into next

Browse Source 
* kk/maint-prefix-in-config-mak:
  Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
This commit is contained in:
Junio C Hamano
2011-05-02 16:11:15 -07:00
parent f95594185c 2910bf56a4
commit c747ba3ea1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -291,15 +291,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
ETC_GITCONFIG = $(git_etcdir)/gitconfig
ETC_GITATTRIBUTES = $(git_etcdir)/gitattributes
lib = lib
# DESTDIR=
pathsep = :
@@ -1195,6 +1188,14 @@ endif
-include config.mak.autogen
-include config.mak
ifeq ($(prefix),/usr)
sysconfdir = /etc
git_etcdir = /etc
else
sysconfdir = $(prefix)/etc
git_etcdir = etc
endif
ifdef CHECK_HEADER_DEPENDENCIES
COMPUTE_HEADER_DEPENDENCIES =
USE_COMPUTED_HEADER_DEPENDENCIES =