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

[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)
 
 
 # make bzr.exe for win32 with py2exe

=== modified file NEWS
--- NEWS
+++ NEWS
@@ -8,6 +8,9 @@
     * ``selftest`` has new short options ``-f`` and ``-1``.  (Martin
       Pool)
 
+    * ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
+      (Robert Collins)
+
   INTERNALS:
 
     * bzrlib API compatability with 0.8 has been dropped, cleaning up some

=== modified directory  // last-changed:robertc at robertcollins.net-2007041902274
... 4-pfdqz42kp1wizh43
# revision id: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
# sha1: acb8ac70cdb2084e8fbba4e452b3178bae03a045
# inventory sha1: d351e15e7f13b801e9bda96f342c38a33252e331
# parent ids:
#   pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
# base id: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
# properties:
#   branch-nick: make-man1


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070419/e823e829/attachment.pgp