mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Make sure 'make install' does not have to rebuild templates.
The dependency rule in templates directory forced 'make install' that immediately followed 'make all' to rebuild boilerplates. This was problematic for a workflow that built first as yourself and then installed as root, from a working tree that is on an NFS mounted filesystem that is unwritable by root. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e1e9c25466
commit
8c51242873
|
@ -6,13 +6,15 @@ prefix ?= $(HOME)
|
||||||
template_dir ?= $(prefix)/share/git-core/templates/
|
template_dir ?= $(prefix)/share/git-core/templates/
|
||||||
# DESTDIR=
|
# DESTDIR=
|
||||||
|
|
||||||
all: boilerplates custom
|
all: boilerplates.made custom
|
||||||
find blt
|
find blt
|
||||||
|
|
||||||
# Put templates that can be copied straight from the source
|
# Put templates that can be copied straight from the source
|
||||||
# in a file direc--tory--file in the source. They will be
|
# in a file direc--tory--file in the source. They will be
|
||||||
# just copied to the destination.
|
# just copied to the destination.
|
||||||
boilerplates:
|
|
||||||
|
bpsrc = $(filter-out %~,$(wildcard *--*))
|
||||||
|
boilerplates.made : $(bpsrc)
|
||||||
ls *--* 2>/dev/null | \
|
ls *--* 2>/dev/null | \
|
||||||
while read boilerplate; \
|
while read boilerplate; \
|
||||||
do \
|
do \
|
||||||
|
@ -25,6 +27,7 @@ boilerplates:
|
||||||
*) cp $$boilerplate blt/$$dst ;; \
|
*) cp $$boilerplate blt/$$dst ;; \
|
||||||
esac || exit; \
|
esac || exit; \
|
||||||
done || exit
|
done || exit
|
||||||
|
date >$@
|
||||||
|
|
||||||
# If you need build-tailored templates, build them into blt/
|
# If you need build-tailored templates, build them into blt/
|
||||||
# directory yourself here.
|
# directory yourself here.
|
||||||
|
@ -32,7 +35,7 @@ custom:
|
||||||
: no custom templates yet
|
: no custom templates yet
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf blt
|
rm -rf blt boilerplates.made
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
|
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
|
||||||
|
|
Loading…
Reference in a new issue