undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Definitions of ETC_GITCONFIG, ETC_GITATTRIBUTES and sysconfdir depend on
value of prefix. As prefix can be changed in config.mak.autogen, all if
blocks with conditions based on prefix should be placed after the file
is included in Makefile.

Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kacper Kornet 2011-04-28 21:27:51 +02:00 committed by Junio C Hamano
parent 4fec83045b
commit 2910bf56a4
1 changed files with 10 additions and 9 deletions
Show Stats 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 = :
@ -1196,6 +1189,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 =