From d52fd42acd77613970dc8eef2c589fff6cc1e330 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 11 Jun 2007 11:10:47 +0200 Subject: [PATCH] Remove trailing slash from $(template_dir). All the other directory location variables do not have the trailing slash. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- Makefile | 2 +- builtin-init-db.c | 2 +- templates/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7ce248ea8..0f6540c6d 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 4df9fd0fa..0be2d2ef6 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 b8352e731..aaa39d30f 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); -- 2.26.2