From: Jan Nieuwenhuizen <janneke-list@xs4all.nl>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain
Date: Wed, 13 Aug 2008 09:04:49 +0200 [thread overview]
Message-ID: <1218611089.7561.11.camel@heerbeest> (raw)
In-Reply-To: <36ca99e90808120934h6d86a7cbpeca8a6c85ba3bce2@mail.gmail.com>
On di, 2008-08-12 at 18:34 +0200, Bert Wesarg wrote:
> On Tue, Aug 12, 2008 at 14:54, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> > First an install nitpick.
> > + install -d -m 755 "$(DESTDIR)$(bindir)"
> > + install -d -m 755 "$(DESTDIR)$(bindir)"
> duplicate
Now I see: we both fixed that. I did not see the merge conflict, should
have looked better. New try:
[Why is it so difficult for a SCM to detect such duplicates? Of course,
once in a 1000 years you'd want two identical lines, but wouldn't it be
nice if by default git would help you would not to mess up]
Signed-off-by: Jan Nieuwenhuizen <janneke@gnu.org>
---
Makefile | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 6eade1e..af46399 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-# Set PREFIX to wherever you want to install TopGit
-PREFIX = $(HOME)
-bindir = $(PREFIX)/bin
-cmddir = $(PREFIX)/libexec/topgit
-sharedir = $(PREFIX)/share/topgit
+prefix = $(HOME)
+bindir = $(prefix)/bin
+cmddir = $(prefix)/libexec/topgit
+sharedir = $(prefix)/share/topgit
hooksdir = $(cmddir)/hooks
@@ -31,14 +30,14 @@ $(help_out): README
./create-help.sh $$CMD
install:: all
- install -d -m 755 "$(bindir)"
- install tg "$(bindir)"
- install -d -m 755 "$(cmddir)"
- install $(commands_out) "$(cmddir)"
- install -d -m 755 "$(hooksdir)"
- install $(hooks_out) "$(hooksdir)"
- install -d -m 755 "$(sharedir)"
- install -m 644 $(help_out) "$(sharedir)"
+ install -d -m 755 "$(DESTDIR)$(bindir)"
+ install tg "$(DESTDIR)$(bindir)"
+ install -d -m 755 "$(DESTDIR)$(cmddir)"
+ install $(commands_out) "$(DESTDIR)$(cmddir)"
+ install -d -m 755 "$(DESTDIR)$(hooksdir)"
+ install $(hooks_out) "$(DESTDIR)$(hooksdir)"
+ install -d -m 755 "$(DESTDIR)$(sharedir)"
+ install -m 644 $(help_out) "$(DESTDIR)$(sharedir)"
clean::
rm -f tg $(commands_out) $(hooks_out) $(help_out)
--
1.6.0.rc0.44.g67270
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.lilypond.org
prev parent reply other threads:[~2008-08-13 10:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 12:54 TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain Jan Nieuwenhuizen
2008-08-12 16:34 ` Bert Wesarg
2008-08-13 7:04 ` Jan Nieuwenhuizen [this message]
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=1218611089.7561.11.camel@heerbeest \
--to=janneke-list@xs4all.nl \
--cc=bert.wesarg@googlemail.com \
--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;
as well as URLs for NNTP newsgroup(s).