From: Pavel Roskin <proski@gnu.org>
Date: Wed, 25 Jan 2006 06:52:22 +0000 (-0500)
Subject: Don't include ../README in git.txt - make a local copy
X-Git-Tag: v1.2.0~116
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=941c9449999192e2d338ee204f4153e30ae43829;p=git.git

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 9fef49087..c87c61af0 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 a65fb1b66..a3bca86cb 100644
--- 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 25bcb840f..e8ef3efa8 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -586,7 +586,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------