Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/ja/Makefile @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | cadde8ebf167 |
children |
rev | line source |
---|---|
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
1 SOURCES=$(wildcard *.[0-9].ja.txt) |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
2 MAN=$(SOURCES:%.txt=%) |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
3 HTML=$(SOURCES:%.txt=%.html) |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
4 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
5 all: man html |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
6 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
7 man: $(MAN) |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
8 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
9 html: $(HTML) |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
10 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
11 %: %.xml |
1500
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
12 xmlto -x docbook.ja.xsl man $*.xml |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
13 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
14 %.xml: %.txt |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
15 -asciidoc -d manpage -b docbook -f docbook.ja.conf $*.txt |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
16 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
17 %.html: %.txt |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
18 asciidoc -b html4 $*.txt |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
19 |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
20 clean: |
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
21 $(RM) $(MAN:%.ja=%) $(MAN:%=%.xml) $(MAN:%=%.html) |