summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <J.Sixt@eudaptics.com>2007-06-11 09:10:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-12 07:23:31 (GMT)
commitd52fd42acd77613970dc8eef2c589fff6cc1e330 (patch)
tree54fcba29b717ff89d2848bb84115cff010167ac2
parent9354768ab7a349f0df7c8aa08e6fe98547882809 (diff)
downloadgit-d52fd42acd77613970dc8eef2c589fff6cc1e330.zip
git-d52fd42acd77613970dc8eef2c589fff6cc1e330.tar.gz
git-d52fd42acd77613970dc8eef2c589fff6cc1e330.tar.bz2
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>
-rw-r--r--Makefile2
-rw-r--r--builtin-init-db.c2
-rw-r--r--templates/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7ce248e..0f6540c 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);