From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Jun 2011 21:02:39 +0000 (-0700)
Subject: Merge branch 'kk/maint-prefix-in-config-mak' into maint
X-Git-Tag: v1.7.5.4~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c72b9143f90f839fdfe34ea252e84cb43be71d95?ds=inline;hp=-c

Merge branch 'kk/maint-prefix-in-config-mak' into maint

* kk/maint-prefix-in-config-mak:
config.mak.in: allow "configure --sysconfdir=/else/where"
---

c72b9143f90f839fdfe34ea252e84cb43be71d95
diff --combined config.mak.in
index e378534cbd,dd8f2745a6..1258528a26
--- a/config.mak.in
+++ b/config.mak.in
@@@ -18,6 -18,7 +18,7 @@@ bindir = @bindir
  gitexecdir = @libexecdir@/git-core
  datarootdir = @datarootdir@
  template_dir = @datadir@/git-core/templates
+ sysconfdir = @sysconfdir@
  
  mandir=@mandir@
  
@@@ -43,6 -44,7 +44,6 @@@ NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT
  NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
  NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
  NO_IPV6=@NO_IPV6@
 -NO_C99_FORMAT=@NO_C99_FORMAT@
  NO_HSTRERROR=@NO_HSTRERROR@
  NO_STRCASESTR=@NO_STRCASESTR@
  NO_STRTOK_R=@NO_STRTOK_R@