diff options
| author |  Johannes Sixt <J.Sixt@eudaptics.com> | 2007-06-11 11:10:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:23:31 -0700 |
| commit | d52fd42acd77613970dc8eef2c589fff6cc1e330 (patch) | |
| tree | 54fcba29b717ff89d2848bb84115cff010167ac2 | |
| parent | Avoid double-slash in path names that depend on $(sharedir). (diff) | |
| download | tgif-d52fd42acd77613970dc8eef2c589fff6cc1e330.tar.xz | |
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-- | Makefile | 2 | ||||
| -rw-r--r-- | builtin-init-db.c | 2 | ||||
| -rw-r--r-- | templates/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 4df9fd0fad..0be2d2ef6e 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 b8352e731b..aaa39d30fa 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); |