From: Martin Waitz Date: Thu, 25 May 2006 12:37:46 +0000 (+0200) Subject: Documentation/Makefile: remove extra / X-Git-Tag: v1.4.0-rc1~66 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c53603249c8fc8ee5e12710087e7287eb6dda5f6;p=git.git 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 --- diff --git a/Documentation/Makefile b/Documentation/Makefile index 2a08f592d..2b0efe792 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 dbf19c627..a07964b0e 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