Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
This reverts commit 2910bf56a4ffc13c398fb04ba32910cb3b724091, as it does not really solve the issue of making $(sysconfigdir) any more useful than it currently is.
Junio C Hamano committed
May 9, 2011 at 15:12 UTC
410ee20bde21b014c7655ea4f19d4ca66486df22
1 file changed
+9
-10
Makefile
+9
-10
@@ -291,8 +291,15 @@ sharedir = $(prefix)/share
291
gitwebdir = $(sharedir)/gitweb
292
template_dir = share/git-core/templates
293
htmldir = share/doc/git-doc
294
-ETC_GITCONFIG = $(git_etcdir)/gitconfig
295
-ETC_GITATTRIBUTES = $(git_etcdir)/gitattributes
294
+ifeq ($(prefix),/usr)
295
+sysconfdir = /etc
296
+ETC_GITCONFIG = $(sysconfdir)/gitconfig
297
+ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
298
+else
299
+sysconfdir = $(prefix)/etc
300
+ETC_GITCONFIG = etc/gitconfig
301
+ETC_GITATTRIBUTES = etc/gitattributes
302
+endif
303
lib = lib
304
# DESTDIR=
305
pathsep = :
@@ -1189,14 +1196,6 @@ endif
1196
-include config.mak.autogen
1197
-include config.mak
1198
1192
-ifeq ($(prefix),/usr)
1193
-sysconfdir = /etc
1194
-git_etcdir = /etc
1195
-else
1196
-sysconfdir = $(prefix)/etc
1197
-git_etcdir = etc
1198
-endif
1199
-
1199
ifdef CHECK_HEADER_DEPENDENCIES
1200
COMPUTE_HEADER_DEPENDENCIES =
1201
USE_COMPUTED_HEADER_DEPENDENCIES =