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>

diff --git a/templates/Makefile b/templates/Makefile
index 221a0860661a3adb43470aa22d30b54601223b3d..c23aee866d3eca13abd5586ee06bac6e2ab87dc7 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,13 +6,15 @@ prefix ?= $(HOME)
 template_dir ?= $(prefix)/share/git-core/templates/
 # DESTDIR=
 
 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.
        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 \
        ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \


@@ -25,6 +27,7 @@ boilerplates:
                *) cp $$boilerplate blt/$$dst ;; \
                esac || exit; \
        done || exit
                *) cp $$boilerplate blt/$$dst ;; \
                esac || exit; \
        done || exit

+       date >$@

 
 # If you need build-tailored templates, build them into blt/
 # directory yourself here.
 
 # If you need build-tailored templates, build them into blt/
 # directory yourself here.


@@ -32,7 +35,7 @@ custom:
        : no custom templates yet
 
 clean:
        : no custom templates yet
 
 clean:

-       rm -rf blt
+       rm -rf blt boilerplates.made

 
 install: all
        $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
 
 install: all
        $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)