- up to 1.7.5.3

[packages/git-core.git] / git-core-sysconfdir.patch

diff --git a/git-core-sysconfdir.patch b/git-core-sysconfdir.patch
index 469ba0a840770cb4407522bd391c9e50e3f693d4..2de02aa291997cafd627ff2d0f5d9f86482fe2f6 100644 (file)
--- a/git-core-sysconfdir.patch
+++ b/git-core-sysconfdir.patch
@@ -1,36 +1,3 @@
-diff --git a/Makefile b/Makefile
-index cbc3fce..f5a37b5 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 =
 diff --git a/config.mak.in b/config.mak.in
 index e378534..3006494 100644
 --- a/config.mak.in