From: "Ramsay Jones" <ramsay@ramsay1.demon.co.uk>
To: <git@vger.kernel.org>
Subject: [PATCH 3/10] Fix installation of templates on ancient systems.
Date: Wed, 2 Aug 2006 02:03:20 +0100 [thread overview]
Message-ID: <00aa01c6b5cf$72231f80$c47eedc1@ramsay1.demon.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]
Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
---
Makefile | 2 +-
templates/Makefile | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index cde619c..180dbd0 100644
--- a/Makefile
+++ b/Makefile
@@ -662,7 +662,7 @@ install: all
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
- $(MAKE) -C templates install
+ $(MAKE) -C templates install DESTDIR=$(DESTDIR)
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
diff --git a/templates/Makefile b/templates/Makefile
index 8f7f4fe..9e1ae1a 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 -)
--
1.4.1
[-- Attachment #2: P0003.TXT --]
[-- Type: text/plain, Size: 2006 bytes --]
From 4903e542f4361d06361027c10e38750eee7a1208 Mon Sep 17 00:00:00 2001
From: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Date: Sat, 29 Jul 2006 17:25:03 +0100
Subject: [PATCH 3/10] Fix installation of templates on ancient systems.
Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
---
Makefile | 2 +-
templates/Makefile | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index cde619c..180dbd0 100644
--- a/Makefile
+++ b/Makefile
@@ -662,7 +662,7 @@ install: all
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
- $(MAKE) -C templates install
+ $(MAKE) -C templates install DESTDIR=$(DESTDIR)
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
diff --git a/templates/Makefile b/templates/Makefile
index 8f7f4fe..9e1ae1a 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 -)
--
1.4.1
reply other threads:[~2006-08-02 1:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='00aa01c6b5cf$72231f80$c47eedc1@ramsay1.demon.co.uk' \
--to=ramsay@ramsay1.demon.co.uk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox