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>
This commit is contained in:
parent
9354768ab7
commit
d52fd42acd
2
Makefile
2
Makefile
@ -145,7 +145,7 @@ prefix = $(HOME)
|
|||||||
bindir = $(prefix)/bin
|
bindir = $(prefix)/bin
|
||||||
gitexecdir = $(bindir)
|
gitexecdir = $(bindir)
|
||||||
sharedir = $(prefix)/share
|
sharedir = $(prefix)/share
|
||||||
template_dir = $(sharedir)/git-core/templates/
|
template_dir = $(sharedir)/git-core/templates
|
||||||
ifeq ($(prefix),/usr)
|
ifeq ($(prefix),/usr)
|
||||||
sysconfdir = /etc
|
sysconfdir = /etc
|
||||||
else
|
else
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
|
|
||||||
#ifndef DEFAULT_GIT_TEMPLATE_DIR
|
#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
|
#endif
|
||||||
|
|
||||||
#ifdef NO_TRUSTABLE_FILEMODE
|
#ifdef NO_TRUSTABLE_FILEMODE
|
||||||
|
@ -7,7 +7,7 @@ endif
|
|||||||
INSTALL ?= install
|
INSTALL ?= install
|
||||||
TAR ?= tar
|
TAR ?= tar
|
||||||
prefix ?= $(HOME)
|
prefix ?= $(HOME)
|
||||||
template_dir ?= $(prefix)/share/git-core/templates/
|
template_dir ?= $(prefix)/share/git-core/templates
|
||||||
# DESTDIR=
|
# DESTDIR=
|
||||||
|
|
||||||
# Shell quote (do not use $(call) to accommodate ancient setups);
|
# Shell quote (do not use $(call) to accommodate ancient setups);
|
||||||
|
Loading…
Reference in New Issue
Block a user