← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 02:48:41 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4965.
  • Revision ID: andrew.bennetts@canonical.com-20100112024841-vbudg5ayivfzcwok
Merge lp:bzr, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
199
199
 
200
200
# translate txt docs to html
201
201
derived_txt_files = \
202
 
        doc/en/user-reference/bzr_man.txt \
203
202
        doc/en/release-notes/NEWS.txt
204
203
txt_all = \
205
204
        doc/en/tutorials/tutorial.txt \
296
295
%.html: %.txt
297
296
        $(rst2html) --stylesheet=../../default.css $< $@
298
297
 
299
 
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
300
 
        $(PYTHON) tools/generate_docs.py -o $@ rstx
301
 
 
302
298
doc/en/release-notes/NEWS.txt: NEWS
303
299
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
304
300