Mercurial > hg > mercurial-crew-with-dirclash
view doc/ja/Makefile @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:16 -0600 |
parents | cadde8ebf167 |
children |
line wrap: on
line source
SOURCES=$(wildcard *.[0-9].ja.txt) MAN=$(SOURCES:%.txt=%) HTML=$(SOURCES:%.txt=%.html) all: man html man: $(MAN) html: $(HTML) %: %.xml xmlto -x docbook.ja.xsl man $*.xml %.xml: %.txt -asciidoc -d manpage -b docbook -f docbook.ja.conf $*.txt %.html: %.txt asciidoc -b html4 $*.txt clean: $(RM) $(MAN:%.ja=%) $(MAN:%=%.xml) $(MAN:%=%.html)