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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
chriscool · Jan 25, 2006 · 941c944 · 941c944
1 parent 41e79c9
commit 941c944
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -586,7 +586,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ @@
     *.7
     howto-index.txt
     doc.dep
+    README