On di, 2008-08-12 at 18:34 +0200, Bert Wesarg wrote: > On Tue, Aug 12, 2008 at 14:54, Jan Nieuwenhuizen <janneke-list@xxxxxxxxx> 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@xxxxxxx> --- 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@xxxxxxx> | 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
