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.

     1

SOURCES=$(wildcard *.[0-9].ja.txt)

     2

MAN=$(SOURCES:%.txt=%)

     3

HTML=$(SOURCES:%.txt=%.html)

     4

     5

all: man html

     6

     7

man: $(MAN)

     8

     9

html: $(HTML)

    10

    11

%: %.xml

    12

	xmlto -x docbook.ja.xsl man $*.xml

    13

    14

%.xml: %.txt

    15

	-asciidoc -d manpage -b docbook -f docbook.ja.conf $*.txt

    16

    17

%.html: %.txt

    18

	asciidoc -b html4 $*.txt

    19

    20

clean:

    21

	$(RM) $(MAN:%.ja=%) $(MAN:%=%.xml) $(MAN:%=%.html)