threads / patch / 4289

patchDocumentation/Makefile: remove extra /

Subject: [PATCH] Documentation/Makefile: remove extra /

## tl;dr

2 messages between May 25, 2006 and May 25, 2006. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Martin Waitz· May 25, 2006, 12:37 UTC · lore

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

Show changes to Documentation/Makefile +3 −3

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

Junio C Hamano· May 25, 2006, 20:45 UTC · re: Martin Waitz · lore

Re: [PATCH] Documentation/Makefile: remove extra /

Martin Waitz <tali@admingilde.org> writes:

Show 23 quoted lines

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