projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge refs/heads/master from paulus
[git.git]
/
Documentation
/
Makefile
diff --git
a/Documentation/Makefile
b/Documentation/Makefile
index
bd6833b
..
aba35d7
100644
(file)
--- a/
Documentation/Makefile
+++ b/
Documentation/Makefile
@@
-5,6
+5,8
@@
DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
DOC_HTML += glossary.html
DOC_HTML += tutorial.html
DOC_HTML += howto-index.html
DOC_HTML += glossary.html
DOC_HTML += tutorial.html
DOC_HTML += howto-index.html
+DOC_HTML += howto/revert-branch-rebase.html
+
DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
@@
-45,7
+47,7
@@
git-diff-%.txt: diff-format.txt diff-options.txt
touch $@
clean:
touch $@
clean:
- rm -f *.xml *.html *.1 *.7 howto-index.txt
+ rm -f *.xml *.html *.1 *.7 howto-index.txt
howto/*.html
%.html : %.txt
asciidoc -b xhtml11 -d manpage $<
%.html : %.txt
asciidoc -b xhtml11 -d manpage $<
@@
-74,5
+76,10
@@
howto-index.html: howto-index.txt
WEBDOC_DEST = /pub/software/scm/git/docs
WEBDOC_DEST = /pub/software/scm/git/docs
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+ rm -f $@+ $@
+ sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
+ mv $@+ $@
+
install-webdoc : html
sh ./install-webdoc.sh $(WEBDOC_DEST)
install-webdoc : html
sh ./install-webdoc.sh $(WEBDOC_DEST)