diff --git a/Makefile b/Makefile index bc7256d170..78e08d3745 100644 --- a/Makefile +++ b/Makefile @@ -743,7 +743,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o EXTLIBS += -lws2_32 X = .exe - NOEXECTEMPL = .noexec template_dir = ../share/git-core/templates/ ETC_GITCONFIG = ../etc/gitconfig endif @@ -1058,7 +1057,7 @@ ifndef NO_TCLTK $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all endif $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all - $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) NOEXECTEMPL='$(NOEXECTEMPL)' + $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) strip: $(PROGRAMS) git$X $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X diff --git a/templates/Makefile b/templates/Makefile index ab2c823ae0..9f3f1fc352 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -10,8 +10,6 @@ RM ?= rm -f prefix ?= $(HOME) template_instdir ?= $(prefix)/share/git-core/templates # DESTDIR= -# set NOEXECTEMPL to non-empty to change the names of hook scripts -# so that the tools will not find them # Shell quote (do not use $(call) to accommodate ancient setups); DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) @@ -34,7 +32,6 @@ boilerplates.made : $(bpsrc) $(INSTALL) -d -m 755 blt/$$dir && \ case "$$boilerplate" in \ *--) ;; \ - hooks--*) cp -p $$boilerplate blt/$${dst}$(NOEXECTEMPL) ;; \ *) cp -p $$boilerplate blt/$$dst ;; \ esac || exit; \ done && \