aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Waitz <tali@admingilde.org>2006-05-25 14:37:46 +0200
committerJunio C Hamano <junkio@cox.net>2006-05-25 22:48:45 -0700
commitc53603249c8fc8ee5e12710087e7287eb6dda5f6 (patch)
tree4ca505d621bebcc65051522ffd69abe25907f615
parente49289dfb788ce47af2939621540fa97abe318ae (diff)
downloadgit-c53603249c8fc8ee5e12710087e7287eb6dda5f6.tar.gz
git-c53603249c8fc8ee5e12710087e7287eb6dda5f6.tar.xz
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>
-rw-r--r--Documentation/Makefile6
-rw-r--r--Makefile2
2 files changed, 4 insertions, 4 deletions
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