git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation/Makefile: remove extra /
@ 2006-05-25 12:37 Martin Waitz
  2006-05-25 20:45 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Waitz @ 2006-05-25 12:37 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

As both DESTDIR and the prefix are supposed to be absolute pathnames
they can simply be concatenated without an extra / (like in the main Makefile).
The extra slash may even break installation on Windows.

Signed-off-by: Martin Waitz <tali@admingilde.org>
---
 Documentation/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2a08f59..2b0efe7 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 install: man
-	$(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
-	$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
-	$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
+	$(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)
+	$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)
+	$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)
 
 
 #
-- 
1.3.3.g29c7

-- 
Martin Waitz

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation/Makefile: remove extra /
  2006-05-25 12:37 [PATCH] Documentation/Makefile: remove extra / Martin Waitz
@ 2006-05-25 20:45 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2006-05-25 20:45 UTC (permalink / raw)
  To: Martin Waitz; +Cc: git

Martin Waitz <tali@admingilde.org> writes:

> As both DESTDIR and the prefix are supposed to be absolute pathnames
> they can simply be concatenated without an extra / (like in the main Makefile).
> The extra slash may even break installation on Windows.
>
> Signed-off-by: Martin Waitz <tali@admingilde.org>
> ---
>  Documentation/Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 2a08f59..2b0efe7 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
>  man7: $(DOC_MAN7)
>  
>  install: man
> -	$(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
> -	$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
> -	$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
> +	$(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)
> +	$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)
> +	$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)

This unfortunately breaks a workaround I did in the main
Makefile for dist-doc target, but I agree it is a good change.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-05-25 20:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-25 12:37 [PATCH] Documentation/Makefile: remove extra / Martin Waitz
2006-05-25 20:45 ` Junio C Hamano

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).