git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/1] Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir

From
Johannes Sixt <j.sixt@viscovery.net>
Date
May 3, 2011, 06:42 UTC
Message-ID
<4DBFA3C6.8060209@viscovery.net>
In-Reply-To
<20110428192751.GE4833@camk.edu.pl>

Please do not set Mail-Followup-To!! It makes communication on this list extremely inconvenient.

Am 4/28/2011 21:27, schrieb Kacper Kornet:
Show 47 quoted lines
> 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 <draenog@pld-linux.org>
> ---
>  Makefile |   19 ++++++++++---------
>  1 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index cbc3fce..bf912b9 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 = :
> @@ -1192,6 +1185,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 =

Does this patch do anything useful? After the patch is applied, sysconfdir is set-but-not-used. Therefore, you can remove the assignments. But then you lose the reference to $(prefix) that the commit message claims is so important. Puzzled...

-- Hannes
Previous: Kacper KornetNext: Junio C Hamano
Message 8 of 26 in “Respect definition of prefix from autotools in ETC_GITCONFIG and ETC_GITATTRIBUTES”
  1. Respect definition of prefix from autotools in ETC_GITCONFIG and ETC_GITATTRIBUTESKacper Kornet, Apr 28, 2011
  2. Junio C HamanoApr 28, 2011
  3. Kacper KornetApr 28, 2011
  4. 1/1 Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet, Apr 28, 2011
  5. Honor sysconfdir when set as an configure optionKacper Kornet, Apr 28, 2011
  6. Junio C HamanoApr 28, 2011
  7. Kacper KornetApr 28, 2011
  8. Johannes SixtMay 3, 2011
  9. Junio C HamanoMay 3, 2011
  10. Johannes SixtMay 4, 2011
  11. Kacper KornetMay 4, 2011
  12. Johannes SixtMay 4, 2011
  13. Junio C HamanoMay 4, 2011
  14. Junio C HamanoMay 5, 2011
  15. Johannes SixtMay 5, 2011
  16. Junio C HamanoMay 5, 2011
  17. Johannes SixtMay 6, 2011
  18. Kacper KornetMay 5, 2011
  19. Johannes SixtMay 5, 2011
  20. Kacper KornetMay 5, 2011
  21. Junio C HamanoMay 5, 2011
  22. Johannes SixtMay 9, 2011
  23. Kacper KornetMay 9, 2011
  24. Kacper KornetMay 27, 2011
  25. Kacper KornetMay 5, 2011
  26. Kacper KornetMay 4, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.