Rev 2426: (robertc) ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388. (Robert Collins). in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2426
revision-id: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 08:09:06 +0100
message:
  (robertc) ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388. (Robert Collins).
added:
  man1/                          man1-20070418045910-74ew7wm1oqo2tfv0-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 2425.1.1
    merged: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
    parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: make-man1
    timestamp: Thu 2007-04-19 12:27:44 +1000
    message:
      ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
      (Robert Collins)
=== added directory 'man1'
=== modified file 'Makefile'
--- a/Makefile	2007-04-16 03:26:30 +0000
+++ b/Makefile	2007-04-19 02:27:44 +0000
@@ -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'
--- a/NEWS	2007-04-17 07:09:43 +0000
+++ b/NEWS	2007-04-19 02:27:44 +0000
@@ -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