Remove trailing slash from $(template_dir).

All the other directory location variables do not have the trailing
slash.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 7ce248ea8fa602f32d0335d17b08c61821263f91..0f6540c6d84b95616965330e1d198e976fa1c9f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ prefix = $(HOME)
 bindir = $(prefix)/bin
 gitexecdir = $(bindir)
 sharedir = $(prefix)/share
 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
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
 else

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 4df9fd0fad7bbc3fd0cde1e6e57b902fbd277608..0be2d2ef6eec3e5830e893795cf9219851611859 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -7,7 +7,7 @@
 #include "builtin.h"
 
 #ifndef DEFAULT_GIT_TEMPLATE_DIR
 #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
 #endif
 
 #ifdef NO_TRUSTABLE_FILEMODE

diff --git a/templates/Makefile b/templates/Makefile
index b8352e731bf4baffbda780a1420f52ca4670b828..aaa39d30fa57c21f15b5308f8d51de5c2e9d59c0 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -7,7 +7,7 @@ endif
 INSTALL ?= install
 TAR ?= tar
 prefix ?= $(HOME)
 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);
 # DESTDIR=
 
 # Shell quote (do not use $(call) to accommodate ancient setups);