Junio C Hamano wrote: > > Johannes Sixt <johannes.sixt@xxxxxxxxxx> writes: > > > diff --git a/Makefile b/Makefile > > index af84af9..c23031c 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -144,7 +144,7 @@ STRIP ?= strip > > prefix = $(HOME) > > bindir = $(prefix)/bin > > gitexecdir = $(bindir) > > -sharedir = $(prefix)/share/ > > +sharedir = $(prefix)/share > > template_dir = $(sharedir)/git-core/templates/ > > ifeq ($(prefix),/usr) > > sysconfdir = /etc > > This suggests that we would also want to drop the trailing slash > from template_dir, doesn't it? > > I took a brief look at builtin-init-db.c but it seems that the > code is safe with or without the trailing slash there. It amounts to this on top of my other patch. It's not worth it, if you ask me. --- 8< --- From: Johannes Sixt <johannes.sixt@xxxxxxxxxx> Subject: [PATCH] Remove trailing slash from $(template_dir). This is just a consistency cleanup. sharedir is defined a line above template_dir and doesn't have the trailing slash, either. Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> --- Makefile | 2 +- builtin-init-db.c | 2 +- templates/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c23031c..7091a4b 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) sharedir = $(prefix)/share -template_dir = $(sharedir)/git-core/templates/ +template_dir = $(sharedir)/git-core/templates ifeq ($(prefix),/usr) sysconfdir = /etc else diff --git a/builtin-init-db.c b/builtin-init-db.c index 4df9fd0..0be2d2e 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -7,7 +7,7 @@ #include "builtin.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR -#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates/" +#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates" #endif #ifdef NO_TRUSTABLE_FILEMODE diff --git a/templates/Makefile b/templates/Makefile index b8352e7..aaa39d3 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -7,7 +7,7 @@ endif INSTALL ?= install TAR ?= tar prefix ?= $(HOME) -template_dir ?= $(prefix)/share/git-core/templates/ +template_dir ?= $(prefix)/share/git-core/templates # DESTDIR= # Shell quote (do not use $(call) to accommodate ancient setups); -- 1.5.2.1.176.g7084-dirty - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
