From 2910bf56a4ffc13c398fb04ba32910cb3b724091 Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Thu, 28 Apr 2011 21:27:51 +0200 Subject: Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir Definitions of ETC_GITCONFIG, ETC_GITATTRIBUTES and sysconfdir 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 Signed-off-by: Junio C Hamano diff --git a/Makefile b/Makefile index 5c2b797..a31d935 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 +ETC_GITCONFIG = $(git_etcdir)/gitconfig +ETC_GITATTRIBUTES = $(git_etcdir)/gitattributes lib = lib # DESTDIR= pathsep = : @@ -1196,6 +1189,14 @@ endif -include config.mak.autogen -include config.mak +ifeq ($(prefix),/usr) +sysconfdir = /etc +git_etcdir = /etc +else +sysconfdir = $(prefix)/etc +git_etcdir = etc +endif + ifdef CHECK_HEADER_DEPENDENCIES COMPUTE_HEADER_DEPENDENCIES = USE_COMPUTED_HEADER_DEPENDENCIES = -- cgit v0.10.2-6-g49f6 From 410ee20bde21b014c7655ea4f19d4ca66486df22 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 9 May 2011 15:12:13 -0700 Subject: 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. diff --git a/Makefile b/Makefile index a31d935..5c2b797 100644 --- a/Makefile +++ b/Makefile @@ -291,8 +291,15 @@ sharedir = $(prefix)/share gitwebdir = $(sharedir)/gitweb template_dir = share/git-core/templates htmldir = share/doc/git-doc -ETC_GITCONFIG = $(git_etcdir)/gitconfig -ETC_GITATTRIBUTES = $(git_etcdir)/gitattributes +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 = : @@ -1189,14 +1196,6 @@ endif -include config.mak.autogen -include config.mak -ifeq ($(prefix),/usr) -sysconfdir = /etc -git_etcdir = /etc -else -sysconfdir = $(prefix)/etc -git_etcdir = etc -endif - ifdef CHECK_HEADER_DEPENDENCIES COMPUTE_HEADER_DEPENDENCIES = USE_COMPUTED_HEADER_DEPENDENCIES = -- cgit v0.10.2-6-g49f6 From 9fb1e6984201892b6dfb7e1a9195e2544a5af754 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 9 May 2011 10:24:55 +0200 Subject: Honor $(prefix) set in config.mak* when defining ETC_GIT* Notice that the prefix specified for the build influenced the definitions of ETC_GITCONFIG and ETC_GITATTRIBUTES only when it was exactly '/usr'. Kacper Kornet noticed that this was furthermore only the case when the build was triggered using 'make prefix=/usr', i.e., the prefix was given on the command line; it did not work when the prefix was specified in config.mak because this file is included much later in the Makefile. To fix this, move the conditional after the inclusion of config.mak. Additionally, it is desirable to specify the etc directory for a build (for example, a build with prefix /usr/local may still want to have the system configuration in /etc/gitconfig). For this purpose, promote the variable 'sysconfdir' from a helper variable to a configuration variable. The prefix check that was moved must now be wrapped so that it does not override sysconfdir setting given in config.mak. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano diff --git a/Makefile b/Makefile index 5c2b797..95c0d51 100644 --- a/Makefile +++ b/Makefile @@ -274,8 +274,7 @@ STRIP ?= strip # mandir # infodir # htmldir -# ETC_GITCONFIG (but not sysconfdir) -# ETC_GITATTRIBUTES +# sysconfdir # can be specified as a relative path some/where/else; # this is interpreted as relative to $(prefix) and "git" at # runtime figures out where they are based on the path to the executable. @@ -291,15 +290,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 = : @@ -1196,6 +1188,14 @@ endif -include config.mak.autogen -include config.mak +ifndef sysconfdir +ifeq ($(prefix),/usr) +sysconfdir = /etc +else +sysconfdir = etc +endif +endif + ifdef CHECK_HEADER_DEPENDENCIES COMPUTE_HEADER_DEPENDENCIES = USE_COMPUTED_HEADER_DEPENDENCIES = -- cgit v0.10.2-6-g49f6