projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'js/portable' into next
[git.git]
/
Documentation
/
Makefile
diff --git
a/Documentation/Makefile
b/Documentation/Makefile
index
afdecc1
..
a3bca86
100644
(file)
--- a/
Documentation/Makefile
+++ b/
Documentation/Makefile
@@
-4,10
+4,13
@@
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 += repository-layout
ARTICLES += cvs-migration
ARTICLES += diffcore
ARTICLES += howto-index
ARTICLES += repository-layout
+ARTICLES += hooks
+ARTICLES += everyday
# with their own formatting rules.
SP_ARTICLES = glossary howto/revert-branch-rebase
# with their own formatting rules.
SP_ARTICLES = glossary howto/revert-branch-rebase
@@
-16,14
+19,14
@@
DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
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))
-prefix=$(HOME)
+prefix
?
=$(HOME)
bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=
bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=
-INSTALL=install
+INSTALL
?
=install
#
# Please note that there is a minor bug in asciidoc.
#
# Please note that there is a minor bug in asciidoc.
@@
-43,28
+46,41
@@
man: man1 man7
man1: $(DOC_MAN1)
man7: $(DOC_MAN7)
man1: $(DOC_MAN1)
man7: $(DOC_MAN7)
-install:
- $(INSTALL) -
m755 -d
$(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+install:
man
+ $(INSTALL) -
d -m755
$(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
-# 'include' dependencies
-git-diff-%.txt: diff-format.txt diff-options.txt
- touch $@
+
+#
+# Determine "include::" file references in asciidoc files.
+#
+doc.dep : $(wildcard *.txt) build-docdep.perl
+ rm -f $@+ $@
+ perl ./build-docdep.perl >$@+
+ mv $@+ $@
+
+-include doc.dep
+
+git.7: README
+
+README: ../README
+ cp $< $@
+
clean:
clean:
- rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
+ rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
doc.dep README
%.html : %.txt
%.html : %.txt
- asciidoc -b xhtml11 -d manpage $<
+ asciidoc -b xhtml11 -d manpage
-f asciidoc.conf
$<
%.1 %.7 : %.xml
xmlto man $<
%.xml : %.txt
%.1 %.7 : %.xml
xmlto man $<
%.xml : %.txt
- asciidoc -b docbook -d manpage $<
+ 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 $< | \