* TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain
@ 2008-08-12 12:54 Jan Nieuwenhuizen
2008-08-12 16:34 ` Bert Wesarg
0 siblings, 1 reply; 3+ messages in thread
From: Jan Nieuwenhuizen @ 2008-08-12 12:54 UTC (permalink / raw)
To: git
First an install nitpick.
Signed-off-by: Jan Nieuwenhuizen <janneke@gnu.org>
---
Makefile | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 6eade1e..ea6489e 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,15 @@ $(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 -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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain
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
0 siblings, 1 reply; 3+ messages in thread
From: Bert Wesarg @ 2008-08-12 16:34 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: git
On Tue, Aug 12, 2008 at 14:54, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> First an install nitpick.
>
>
>
> Signed-off-by: Jan Nieuwenhuizen <janneke@gnu.org>
> ---
> Makefile | 26 +++++++++++++-------------
> 1 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6eade1e..ea6489e 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,15 @@ $(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 -d -m 755 "$(DESTDIR)$(bindir)"
duplicate
Bert
> + 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain
2008-08-12 16:34 ` Bert Wesarg
@ 2008-08-13 7:04 ` Jan Nieuwenhuizen
0 siblings, 0 replies; 3+ messages in thread
From: Jan Nieuwenhuizen @ 2008-08-13 7:04 UTC (permalink / raw)
To: Bert Wesarg; +Cc: git
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-13 10:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).