From c53603249c8fc8ee5e12710087e7287eb6dda5f6 Mon Sep 17 00:00:00 2001 From: Martin Waitz Date: Thu, 25 May 2006 14:37:46 +0200 Subject: [PATCH] Documentation/Makefile: remove extra / 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. [jc: adjusted an earlier workaround for this problem in the dist-doc target in the main Makefile as well. ] Signed-off-by: Martin Waitz Signed-off-by: Junio C Hamano --- Documentation/Makefile | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 2a08f592..2b0efe79 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) # diff --git a/Makefile b/Makefile index dbf19c62..a07964b0 100644 --- a/Makefile +++ b/Makefile @@ -680,7 +680,7 @@ dist-doc: : rm -fr .doc-tmp-dir mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7 - $(MAKE) -C Documentation DESTDIR=. \ + $(MAKE) -C Documentation DESTDIR=./ \ man1=../.doc-tmp-dir/man1 \ man7=../.doc-tmp-dir/man7 \ install -- 2.11.0