From: Petr Baudis <pasky@suse.cz>
To: git@vger.kernel.org
Subject: [PATCH] Use $DESTDIR instead of $dest
Date: Fri, 5 Aug 2005 01:56:38 +0200 [thread overview]
Message-ID: <20050804235638.GL24479@pasky.ji.cz> (raw)
In-Reply-To: <20050804225529.GJ24479@pasky.ji.cz>
$DESTDIR is more usual during the build than $dest and is what is usually
used in the makefiles, so let's use it too.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
---
This updates the subdirectory Makefiles as well.
commit aef274d1fc04d848c7355a68c3e48c0b2b5400cb
tree 546c10ded595cf48473ce216b594607fd922836d
parent aa6f095b0cd57ab424f02695ccfc8168f5c3b981
author Petr Baudis <pasky@suse.cz> Fri, 05 Aug 2005 01:55:36 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 05 Aug 2005 01:55:36 +0200
Documentation/Makefile | 6 +++---
Makefile | 6 +++---
templates/Makefile | 10 +++++-----
tools/Makefile | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -33,9 +33,9 @@ man1: $(DOC_MAN1)
man7: $(DOC_MAN7)
install:
- $(INSTALL) -m755 -d $(dest)/$(man1) $(dest)/$(man7)
- $(INSTALL) $(DOC_MAN1) $(dest)/$(man1)
- $(INSTALL) $(DOC_MAN7) $(dest)/$(man7)
+ $(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+ $(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
+ $(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
# 'include' dependencies
git-diff-%.txt: diff-format.txt diff-options.txt
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ prefix=$(HOME)
bindir=$(prefix)/bin
etcdir=$(prefix)/etc
etcgitdir=$(etcdir)/git-core
-# dest=
+# DESTDIR=
CC?=gcc
AR?=ar
@@ -197,8 +197,8 @@ check:
### Installation rules
install: $(PROG) $(SCRIPTS)
- $(INSTALL) -m755 -d $(dest)$(bindir)
- $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+ $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+ $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
$(MAKE) -C templates install
install-tools:
diff --git a/templates/Makefile b/templates/Makefile
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -5,15 +5,15 @@ prefix=$(HOME)
etcdir=$(prefix)/etc
etcgitdir=$(etcdir)/git-core
templatedir=$(etcgitdir)/templates
-# dest=
+# DESTDIR=
all:
clean:
install:
- $(INSTALL) -d -m755 $(dest)$(templatedir)/hooks/
+ $(INSTALL) -d -m755 $(DESTDIR)$(templatedir)/hooks/
$(foreach s,$(wildcard hooks--*),\
$(INSTALL) -m644 $s \
- $(dest)$(templatedir)/hooks/$(patsubst hooks--%,%,$s);)
- $(INSTALL) -d -m755 $(dest)$(templatedir)/info
- $(INSTALL) -d -m755 $(dest)$(templatedir)/branches
+ $(DESTDIR)$(templatedir)/hooks/$(patsubst hooks--%,%,$s);)
+ $(INSTALL) -d -m755 $(DESTDIR)$(templatedir)/info
+ $(INSTALL) -d -m755 $(DESTDIR)$(templatedir)/branches
diff --git a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,7 @@ INSTALL=install
HOME=$(shell echo $$HOME)
prefix=$(HOME)
bindir=$(prefix)/bin
-# dest=
+# DESTDIR=
PROGRAMS=git-mailsplit git-mailinfo
SCRIPTS=git-applymbox git-applypatch
@@ -19,8 +19,8 @@ git-%: %.c
all: $(PROGRAMS)
install: $(PROGRAMS) $(SCRIPTS)
- $(INSTALL) -m755 -d $(dest)$(bindir)
- $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bindir)
+ $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+ $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
clean:
rm -f $(PROGRAMS) *.o
next prev parent reply other threads:[~2005-08-05 0:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-04 22:55 [PATCH] Use $DESTDIR instead of $dest Petr Baudis
2005-08-04 23:56 ` Petr Baudis [this message]
2005-08-05 23:17 ` Junio C Hamano
2005-08-09 20:57 ` Petr Baudis
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=20050804235638.GL24479@pasky.ji.cz \
--to=pasky@suse.cz \
--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