git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kacper Kornet <kornet@camk.edu.pl>
To: git@vger.kernel.org
Subject: [PATCH] Respect definition of prefix from autotools in ETC_GITCONFIG and ETC_GITATTRIBUTES
Date: Thu, 28 Apr 2011 04:29:23 +0200	[thread overview]
Message-ID: <20110428022922.GC4833@camk.edu.pl> (raw)

Definitions of ETC_GITCONFIG and ETC_GITATTRIBUTES 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>
---
 Makefile |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index cbc3fce..5b4ae40 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
 lib = lib
 # DESTDIR=
 pathsep = :
@@ -1192,6 +1185,12 @@ endif
 -include config.mak.autogen
 -include config.mak
 
+ifeq ($(prefix),/usr)
+sysconfdir = /etc
+else
+sysconfdir = etc
+endif
+
 ifdef CHECK_HEADER_DEPENDENCIES
 COMPUTE_HEADER_DEPENDENCIES =
 USE_COMPUTED_HEADER_DEPENDENCIES =
-- 
1.7.5

-- 
  Kacper Kornet

             reply	other threads:[~2011-04-28  2:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-28  2:29 Kacper Kornet [this message]
2011-04-28 16:54 ` [PATCH] Respect definition of prefix from autotools in ETC_GITCONFIG and ETC_GITATTRIBUTES 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     ` [PATCH] Honor sysconfdir when set as an configure option Kacper Kornet
2011-04-28 21:05       ` 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=20110428022922.GC4833@camk.edu.pl \
    --to=kornet@camk.edu.pl \
    --cc=git@vger.kernel.org \
    /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).