* [PATCH] Use $DESTDIR instead of $dest
@ 2005-08-04 22:55 Petr Baudis
2005-08-04 23:56 ` Petr Baudis
0 siblings, 1 reply; 4+ messages in thread
From: Petr Baudis @ 2005-08-04 22:55 UTC (permalink / raw
To: git
$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>
---
commit ffc29a11e9be157e2349d431adadf1b6e91a2251
tree fbd1076ed78c609777f81094cb8989b5b32973da
parent aa6f095b0cd57ab424f02695ccfc8168f5c3b981
author Petr Baudis <pasky@suse.cz> Fri, 05 Aug 2005 00:54:52 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 05 Aug 2005 00:54:52 +0200
Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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:
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Use $DESTDIR instead of $dest
2005-08-04 22:55 [PATCH] Use $DESTDIR instead of $dest Petr Baudis
@ 2005-08-04 23:56 ` Petr Baudis
2005-08-05 23:17 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Petr Baudis @ 2005-08-04 23:56 UTC (permalink / raw
To: git
$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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Use $DESTDIR instead of $dest
2005-08-04 23:56 ` Petr Baudis
@ 2005-08-05 23:17 ` Junio C Hamano
2005-08-09 20:57 ` Petr Baudis
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2005-08-05 23:17 UTC (permalink / raw
To: Petr Baudis; +Cc: git
Petr Baudis <pasky@suse.cz> writes:
> $DESTDIR is more usual during the build than $dest and is what is usually
> used in the makefiles, so let's use it too.
While I do not have much preference either way, I do not want to
make this kind of change without making corresponding changes to
the spec.in and debian/rules file in the same commit, or another
commit that immediately follow it. And I wanted to do a 0.99.4
tomorrow, so I hope you would not mind if I placed this on
hold...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Use $DESTDIR instead of $dest
2005-08-05 23:17 ` Junio C Hamano
@ 2005-08-09 20:57 ` Petr Baudis
0 siblings, 0 replies; 4+ messages in thread
From: Petr Baudis @ 2005-08-09 20:57 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
Dear diary, on Sat, Aug 06, 2005 at 01:17:17AM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> told me that...
> Petr Baudis <pasky@suse.cz> writes:
>
> > $DESTDIR is more usual during the build than $dest and is what is usually
> > used in the makefiles, so let's use it too.
>
> While I do not have much preference either way, I do not want to
> make this kind of change without making corresponding changes to
> the spec.in and debian/rules file in the same commit, or another
> commit that immediately follow it. And I wanted to do a 0.99.4
> tomorrow, so I hope you would not mind if I placed this on
> hold...
No problem, this was just some of the last tidbits wrt. synchronization
of the makefiles with Cogito.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone. -- Alan Cox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-08-09 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-04 22:55 [PATCH] Use $DESTDIR instead of $dest Petr Baudis
2005-08-04 23:56 ` Petr Baudis
2005-08-05 23:17 ` Junio C Hamano
2005-08-09 20:57 ` Petr Baudis
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).