Browse Source

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>
maint
Pavel Roskin 19 years ago committed by Junio C Hamano
parent
commit
941c944999
  1. 1
      Documentation/.gitignore
  2. 9
      Documentation/Makefile
  3. 2
      Documentation/git.txt

1
Documentation/.gitignore vendored

@ -4,3 +4,4 @@ @@ -4,3 +4,4 @@
*.7
howto-index.txt
doc.dep
README

9
Documentation/Makefile

@ -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

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: @@ -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 $< | \

2
Documentation/git.txt

@ -586,7 +586,7 @@ git Diffs @@ -586,7 +586,7 @@ git Diffs

Discussion[[Discussion]]
------------------------
include::../README[]
include::README[]

Authors
-------

Loading…
Cancel
Save