]> git.pld-linux.org Git - packages/git-core.git/blame - git-core-sysconfdir.patch
- place system wide configuration files in %{_sysconfdir}
[packages/git-core.git] / git-core-sysconfdir.patch
CommitLineData
d12d8532
KK
1diff --git a/Makefile b/Makefile
2index cbc3fce..f5a37b5 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -291,15 +291,8 @@ sharedir = $(prefix)/share
6 gitwebdir = $(sharedir)/gitweb
7 template_dir = share/git-core/templates
8 htmldir = share/doc/git-doc
9-ifeq ($(prefix),/usr)
10-sysconfdir = /etc
11 ETC_GITCONFIG = $(sysconfdir)/gitconfig
12 ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
13-else
14-sysconfdir = $(prefix)/etc
15-ETC_GITCONFIG = etc/gitconfig
16-ETC_GITATTRIBUTES = etc/gitattributes
17-endif
18 lib = lib
19 # DESTDIR=
20 pathsep = :
21@@ -1192,6 +1185,12 @@ endif
22 -include config.mak.autogen
23 -include config.mak
24
25+ifeq ($(prefix),/usr)
26+sysconfdir ?= /etc
27+else
28+sysconfdir ?= etc
29+endif
30+
31 ifdef CHECK_HEADER_DEPENDENCIES
32 COMPUTE_HEADER_DEPENDENCIES =
33 USE_COMPUTED_HEADER_DEPENDENCIES =
34diff --git a/config.mak.in b/config.mak.in
35index e378534..3006494 100644
36--- a/config.mak.in
37+++ b/config.mak.in
38@@ -15,6 +15,7 @@ TCLTK_PATH = @TCLTK_PATH@
39 prefix = @prefix@
40 exec_prefix = @exec_prefix@
41 bindir = @bindir@
42+sysconfdir = @sysconfdir@
43 gitexecdir = @libexecdir@/git-core
44 datarootdir = @datarootdir@
45 template_dir = @datadir@/git-core/templates
This page took 0.076229 seconds and 4 git commands to generate.