提交 941c9449 编写于 作者: P Pavel Roskin 提交者: Junio C Hamano

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: NPavel Roskin <proski@gnu.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 41e79c95
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
*.7 *.7
howto-index.txt howto-index.txt
doc.dep doc.dep
README
...@@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl ...@@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl
-include doc.dep -include doc.dep
git.7: ../README git.7: README
README: ../README
cp $< $@
clean: 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 %.html : %.txt
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
...@@ -77,7 +80,7 @@ clean: ...@@ -77,7 +80,7 @@ clean:
%.xml : %.txt %.xml : %.txt
asciidoc -b docbook -d manpage -f asciidoc.conf $< 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 glossary.html : glossary.txt sort_glossary.pl
cat $< | \ cat $< | \
......
...@@ -586,7 +586,7 @@ git Diffs ...@@ -586,7 +586,7 @@ git Diffs
Discussion[[Discussion]] Discussion[[Discussion]]
------------------------ ------------------------
include::../README[] include::README[]
Authors Authors
------- -------
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册