summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKacper Kornet <kornet@camk.edu.pl>2011-04-28 21:27:51 +0200
committerJunio C Hamano <gitster@pobox.com>2011-04-28 13:54:12 -0700
commit2910bf56a4ffc13c398fb04ba32910cb3b724091 (patch)
treeaa6a9244b3041104185c42342e6e97d63330c8f9 /Makefile
parent4fec83045bdc53ed9d3ff71ed099e3e6992b5c56 (diff)
downloadgit-2910bf56a4ffc13c398fb04ba32910cb3b724091.tar.gz
Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 5c2b797554..a31d93523b 100644
--- a/Makefile
+++ b/Makefile
@@ -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 =