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 9fef490..c87c61a 100644 --- 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 a65fb1b..a3bca86 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile
@@ -62,11 +62,14 @@ -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 @@ %.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 25bcb84..e8ef3efa 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt
@@ -586,7 +586,7 @@ Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors -------