diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /templates | |
| parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
| parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz | |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/templates/Makefile b/templates/Makefile index 8f7f4fec34..9e1ae1a4e0 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -6,11 +6,9 @@ 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 @@ -43,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 -) |