mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
When installing, be prepared that template_dir may be relative.
Since the Makefile in the template/ subdirectory is only used to install the templates, we do not simply pass down the setting of template_dir when it is relative, but construct the intended destination in a new variable: A relative template_dir is relative to gitexecdir. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
This commit is contained in:
parent
8512439af2
commit
0b50b860a5
9
Makefile
9
Makefile
|
@ -205,7 +205,7 @@ GITWEB_FAVICON = git-favicon.png
|
|||
GITWEB_SITE_HEADER =
|
||||
GITWEB_SITE_FOOTER =
|
||||
|
||||
export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
|
||||
export prefix bindir gitexecdir sharedir htmldir sysconfdir
|
||||
|
||||
CC = gcc
|
||||
AR = ar
|
||||
|
@ -1297,6 +1297,13 @@ remove-dashes:
|
|||
|
||||
### Installation rules
|
||||
|
||||
ifeq ($(firstword $(subst /, ,$(template_dir))),..)
|
||||
template_instdir = $(gitexecdir)/$(template_dir)
|
||||
else
|
||||
template_instdir = $(template_dir)
|
||||
endif
|
||||
export template_instdir
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
||||
|
|
|
@ -8,12 +8,12 @@ INSTALL ?= install
|
|||
TAR ?= tar
|
||||
RM ?= rm -f
|
||||
prefix ?= $(HOME)
|
||||
template_dir ?= $(prefix)/share/git-core/templates
|
||||
template_instdir ?= $(prefix)/share/git-core/templates
|
||||
# DESTDIR=
|
||||
|
||||
# Shell quote (do not use $(call) to accommodate ancient setups);
|
||||
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
||||
template_dir_SQ = $(subst ','\'',$(template_dir))
|
||||
template_instdir_SQ = $(subst ','\'',$(template_instdir))
|
||||
|
||||
all: boilerplates.made custom
|
||||
|
||||
|
@ -46,6 +46,6 @@ clean:
|
|||
$(RM) -r blt boilerplates.made
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
|
||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)'
|
||||
(cd blt && $(TAR) cf - .) | \
|
||||
(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xf -)
|
||||
(cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xf -)
|
||||
|
|
Loading…
Reference in a new issue