# TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain 3 messages from 2008-08-12 to 2008-08-13. Participants: Jan Nieuwenhuizen, Bert Wesarg. Thread: https://gitlist.dev/t/14960 ## Jan Nieuwenhuizen, 2008-08-12 12:54 Subject: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain Message-ID: <1218545670.7264.2.camel@heerbeest> URL: https://gitlist.dev/e/1218545670.7264.2.camel%40heerbeest ``` First an install nitpick. Signed-off-by: Jan Nieuwenhuizen --- 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 | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org ``` ## Bert Wesarg, 2008-08-12 16:34 Subject: Re: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain Message-ID: <36ca99e90808120934h6d86a7cbpeca8a6c85ba3bce2@mail.gmail.com> URL: https://gitlist.dev/e/36ca99e90808120934h6d86a7cbpeca8a6c85ba3bce2%40mail.gmail.com In-Reply-To: <1218545670.7264.2.camel@heerbeest> ``` On Tue, Aug 12, 2008 at 14:54, Jan Nieuwenhuizen wrote: > First an install nitpick. > > > > Signed-off-by: Jan Nieuwenhuizen > --- > 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 | 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 > ``` ## Jan Nieuwenhuizen, 2008-08-13 07:04 Subject: Re: TOPGIT: [PATCH] Use standard prefix and DESTDIR rather than explain Message-ID: <1218611089.7561.11.camel@heerbeest> URL: https://gitlist.dev/e/1218611089.7561.11.camel%40heerbeest 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 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 --- 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 | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org ```