Don't include ../README in git.txt - make a local copy

asciidoc 7.0.4 and newer considers such includes from parent directory
unsafe.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 9fef490871b94b8434791897bea02e5cbe886032..c87c61af00c6d2cd7212240e26089e24b90bbe05 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -4,3 +4,4 @@
 *.7
 howto-index.txt
 doc.dep
+README

diff --git a/Documentation/Makefile b/Documentation/Makefile
index a65fb1b66b8a313bec82ab361a156ed3842f570b..a3bca86cb0aeb23ea67658de039c5ab79d66d898 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl
 
 -include doc.dep
 
-git.7: ../README
+git.7: README
+
+README: ../README
+       cp $< $@
 
 
 clean:
-       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
+       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README
 
 %.html : %.txt
        asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
@@ -77,7 +80,7 @@ clean:
 %.xml : %.txt
        asciidoc -b docbook -d manpage -f asciidoc.conf $<
 
-git.html: git.txt ../README
+git.html: git.txt README
 
 glossary.html : glossary.txt sort_glossary.pl
        cat $< | \

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 25bcb840f9d3a85bebb632585531c6d0782d6970..e8ef3efa89a69b3ef4a919a40b8fbd4dec690d0f 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -586,7 +586,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------