aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-08 18:01:24 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-09 02:58:35 -0700
commit8c51242873d63cfaf87fa2e2e407198a6ad2c3d0 (patch)
tree59ab70353d22a9855cfe74c5218a6f8b14f5974e /templates
parente1e9c254660244756a72ecfcfff81c15fb32a6e9 (diff)
downloadgit-8c51242873d63cfaf87fa2e2e407198a6ad2c3d0.tar.gz
git-8c51242873d63cfaf87fa2e2e407198a6ad2c3d0.tar.xz
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>
Diffstat (limited to 'templates')
-rw-r--r--templates/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/templates/Makefile b/templates/Makefile
index 221a08606..c23aee866 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,13 +6,15 @@ prefix ?= $(HOME)
template_dir ?= $(prefix)/share/git-core/templates/
# DESTDIR=
-all: boilerplates custom
+all: boilerplates.made custom
find blt
# Put templates that can be copied straight from the source
# in a file direc--tory--file in the source. They will be
# just copied to the destination.
-boilerplates:
+
+bpsrc = $(filter-out %~,$(wildcard *--*))
+boilerplates.made : $(bpsrc)
ls *--* 2>/dev/null | \
while read boilerplate; \
do \
@@ -25,6 +27,7 @@ boilerplates:
*) cp $$boilerplate blt/$$dst ;; \
esac || exit; \
done || exit
+ date >$@
# If you need build-tailored templates, build them into blt/
# directory yourself here.
@@ -32,7 +35,7 @@ custom:
: no custom templates yet
clean:
- rm -rf blt
+ rm -rf blt boilerplates.made
install: all
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)