kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" 

This reverts commit 2910bf56a4, as it
does not really solve the issue of making $(sysconfigdir) any more
useful than it currently is.
maint
Junio C Hamano 2011-05-09 15:12:13 -07:00
parent 2910bf56a4
commit 410ee20bde
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -291,8 +291,15 @@ sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb gitwebdir = $(sharedir)/gitweb
template_dir = share/git-core/templates template_dir = share/git-core/templates
htmldir = share/doc/git-doc htmldir = share/doc/git-doc
ETC_GITCONFIG = $(git_etcdir)/gitconfig ifeq ($(prefix),/usr)
ETC_GITATTRIBUTES = $(git_etcdir)/gitattributes 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 lib = lib
# DESTDIR= # DESTDIR=
pathsep = : pathsep = :
@ -1189,14 +1196,6 @@ endif
-include config.mak.autogen -include config.mak.autogen
-include config.mak -include config.mak


ifeq ($(prefix),/usr)
sysconfdir = /etc
git_etcdir = /etc
else
sysconfdir = $(prefix)/etc
git_etcdir = etc
endif

ifdef CHECK_HEADER_DEPENDENCIES ifdef CHECK_HEADER_DEPENDENCIES
COMPUTE_HEADER_DEPENDENCIES = COMPUTE_HEADER_DEPENDENCIES =
USE_COMPUTED_HEADER_DEPENDENCIES = USE_COMPUTED_HEADER_DEPENDENCIES =