From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:09:12 +0000 (-0700)
Subject: Merge branch 'kk/maint-prefix-in-config-mak'
X-Git-Tag: v1.7.6-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2177dc69cd693eeb52def931f41ad4f3a766846e?ds=inline;hp=-c

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

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

2177dc69cd693eeb52def931f41ad4f3a766846e
diff --combined config.mak.in
index f30130b17a,dd8f2745a6..ab371012a2
--- 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@
@@@ -61,7 -63,6 +62,7 @@@ NO_INET_PTON=@NO_INET_PTON
  NO_ICONV=@NO_ICONV@
  OLD_ICONV=@OLD_ICONV@
  NO_REGEX=@NO_REGEX@
 +USE_LIBPCRE=@USE_LIBPCRE@
  NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
  INLINE=@INLINE@
  SOCKLEN_T=@SOCKLEN_T@