[MERGE] generate bzr.1 from 'make docs'

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins пишет:
> Trying this bundle inline to see if it avoids evolution bustification.
> 
> # Bazaar revision bundle v0.9
> #
> # message:
> #   ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
> #   (Robert Collins)
> #   
> # committer: Robert Collins <robertc at robertcollins.net>
> # date: Thu 2007-04-19 12:27:44.562000036 +1000
> 
> === added directory man1 // file-id:man1-20070418045910-74ew7wm1oqo2tfv0-1
> === modified file Makefile
> --- Makefile
> +++ Makefile
> @@ -62,24 +62,30 @@
>  	python tools/rst2prettyhtml.py doc/bazaar-vcs.org.kid doc/$*.txt \
>  	$(PRETTYDIR)/$*.htm
>  
> -doc/bzr_man.txt: bzrlib/builtins.py \
> +MAN_DEPENDENCIES = bzrlib/builtins.py \
>  		 bzrlib/bundle/commands.py \
>  		 bzrlib/conflicts.py \
>  		 bzrlib/sign_my_commits.py \
>  		 generate_docs.py \
>  		 tools/doc_generate/__init__.py \
>  		 tools/doc_generate/autodoc_rstx.py
> -	python generate_docs.py -o doc/bzr_man.txt rstx
> -
> -docs: $(htm_files) doc/HACKING.htm
> +
> +doc/bzr_man.txt: $(MAN_DEPENDENCIES)
> +	python generate_docs.py -o $@ rstx
> +
> +MAN_PAGES = man1/bzr.1
> +man1/bzr.1: $(MAN_DEPENDENCIES)
> +	python generate_docs.py -o $@ man
> +
> +docs: $(htm_files) $(MAN_PAGES) doc/HACKING.htm
>  
>  copy-docs: docs
>  	python tools/win32/ostools.py copytodir $(htm_files) doc/default.css NEWS README  win32_bzr.exe/doc
>  
>  # clean produced docs
>  clean-docs:
> -	python tools/win32/ostools.py remove doc/bzr_man.txt $(htm_files) \
> -	$(HTMLDIR) $(PRETTYDIR)
> +	python tools/win32/ostools.py remove $(htm_files) \
> +	$(HTMLDIR) $(PRETTYDIR) doc/bzr_man.txt $(MAN_PAGES)

^-- I'm still think that you don't need to delete doc/bzr_man.txt from clean-docs.
This file is auto-generated.
- -0.

[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGJv+pzYr338mxwCURAgXfAJ41kzlNbet/kA9I4C2B5aqG1BbU7QCfX4+W
b3C1c8YIU5SC2h0S4ww80Qc=
=6Py0
-----END PGP SIGNATURE-----