From: Kacper Kornet <kornet@camk.edu.pl>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] Honor sysconfdir when set as an configure option
Date: Thu, 28 Apr 2011 22:01:13 +0200 [thread overview]
Message-ID: <20110428200113.GF4833@camk.edu.pl> (raw)
In-Reply-To: <20110428192751.GE4833@camk.edu.pl>
./configure can be run with option --sysconfdir=...
and Makefile should respect that choice.
Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
---
Makefile | 8 ++++----
config.mak.in | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index bf912b9..9d6cffa 100644
--- a/Makefile
+++ b/Makefile
@@ -1186,11 +1186,11 @@ endif
-include config.mak
ifeq ($(prefix),/usr)
-sysconfdir = /etc
-git_etcdir = /etc
+sysconfdir ?= /etc
+git_etcdir ?= /etc
else
-sysconfdir = $(prefix)/etc
-git_etcdir = etc
+sysconfdir ?= $(prefix)/etc
+git_etcdir ?= etc
endif
ifdef CHECK_HEADER_DEPENDENCIES
diff --git a/config.mak.in b/config.mak.in
index e378534..ac5912d 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -15,6 +15,8 @@ TCLTK_PATH = @TCLTK_PATH@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
+sysconfdir = @sysconfdir@
+git_etcdir = @sysconfdir@
gitexecdir = @libexecdir@/git-core
datarootdir = @datarootdir@
template_dir = @datadir@/git-core/templates
--
1.7.5
--
Kacper Kornet
next prev parent reply other threads:[~2011-04-28 20:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 2:29 [PATCH] Respect definition of prefix from autotools in ETC_GITCONFIG and ETC_GITATTRIBUTES Kacper Kornet
2011-04-28 16:54 ` Junio C Hamano
2011-04-28 17:49 ` Kacper Kornet
2011-04-28 19:27 ` [PATCH 1/1] Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir Kacper Kornet
2011-04-28 20:01 ` Kacper Kornet [this message]
2011-04-28 21:05 ` [PATCH] Honor sysconfdir when set as an configure option Junio C Hamano
2011-04-28 21:22 ` Kacper Kornet
2011-05-03 6:42 ` [PATCH 1/1] Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir Johannes Sixt
2011-05-03 17:32 ` Junio C Hamano
2011-05-04 5:52 ` Johannes Sixt
2011-05-04 13:58 ` Kacper Kornet
2011-05-04 14:39 ` Johannes Sixt
2011-05-04 18:21 ` Junio C Hamano
2011-05-05 2:26 ` Junio C Hamano
2011-05-05 5:58 ` Johannes Sixt
2011-05-05 16:17 ` Junio C Hamano
2011-05-06 7:03 ` Johannes Sixt
2011-05-05 14:29 ` Kacper Kornet
2011-05-05 14:45 ` Johannes Sixt
2011-05-05 15:00 ` Kacper Kornet
2011-05-05 15:46 ` Junio C Hamano
2011-05-09 8:24 ` Johannes Sixt
2011-05-09 11:56 ` Kacper Kornet
2011-05-27 8:17 ` Kacper Kornet
2011-05-05 15:25 ` Kacper Kornet
2011-05-04 14:29 ` Kacper Kornet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110428200113.GF4833@camk.edu.pl \
--to=kornet@camk.edu.pl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).