diff options
| author | Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> | 2006-07-29 17:25:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-02 00:27:18 -0700 |
| commit | 7ffe7098dca297016f87a7e10554e6736f7c3ae2 (patch) | |
| tree | 2f3d097f7b9745cfdc53fb498a59357a49474bb4 /templates | |
| parent | 1fd4da643cb829618bbe76ab37df7f1b4dafc656 (diff) | |
| download | git-7ffe7098dca297016f87a7e10554e6736f7c3ae2.tar.gz | |
Fix installation of templates on ancient systems.
Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.
[jc: we have fixed the main Makefile long time ago, but somehow
forgot to apply the same fix to templates Makefile.]
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 -) |