X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2FMakefile;h=9e1ae1a4e0322a37b494177474a964caf05ca4dd;hb=e27e609bbf81271318d99f2643f378f3fde6c6c6;hp=07e928e56dd00678fdbe092b65bd16f7b7edfcc7;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git diff --git a/templates/Makefile b/templates/Makefile index 07e928e56..9e1ae1a4e 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -6,14 +6,11 @@ prefix ?= $(HOME) template_dir ?= $(prefix)/share/git-core/templates/ # DESTDIR= -# Shell quote; -# Result of this needs to be placed inside '' -shq = $(subst ','\'',$(1)) -# This has surrounding '' -shellquote = '$(call shq,$(1))' +# Shell quote (do not use $(call) to accomodate ancient setups); +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +template_dir_SQ = $(subst ','\'',$(template_dir)) 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 @@ -44,6 +41,6 @@ clean: rm -rf blt boilerplates.made install: all - $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(template_dir)) + $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' (cd blt && $(TAR) cf - .) | \ - (cd $(call shellquote,$(DESTDIR)$(template_dir)) && $(TAR) xf -) + (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)