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 <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2a08f592d99476ced40153880461559d059c53e3..2b0efe7921b61fa3c3c84273054112373aac75ba 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 install: man
 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 dbf19c62775e1a129575fce5281b1a00fb71cdbc..a07964b0e3429a34b9615d8bb468eac81c9c5e5e 100644 (file)
--- 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
        :
        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
                man1=../.doc-tmp-dir/man1 \
                man7=../.doc-tmp-dir/man7 \
                install