projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-tree -c: show a merge commit a bit more sensibly.
[git.git]
/
Documentation
/
Makefile
diff --git
a/Documentation/Makefile
b/Documentation/Makefile
index
a1ff2c2
..
a3bca86
100644
(file)
--- a/
Documentation/Makefile
+++ b/
Documentation/Makefile
@@
-4,6
+4,7
@@
MAN7_TXT=git.txt
DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
ARTICLES = tutorial
DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
ARTICLES = tutorial
+ARTICLES += core-tutorial
ARTICLES += cvs-migration
ARTICLES += diffcore
ARTICLES += howto-index
ARTICLES += cvs-migration
ARTICLES += diffcore
ARTICLES += howto-index
@@
-61,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
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
%.html : %.txt
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
@@
-76,7
+80,7
@@
clean:
%.xml : %.txt
asciidoc -b docbook -d manpage -f asciidoc.conf $<
%.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 $< | \
glossary.html : glossary.txt sort_glossary.pl
cat $< | \